diff --git a/src/main/java/org/symphonyoss/symphony/messageml/elements/RegexElement.java b/src/main/java/org/symphonyoss/symphony/messageml/elements/RegexElement.java
index c3646ddf..de6d5af1 100644
--- a/src/main/java/org/symphonyoss/symphony/messageml/elements/RegexElement.java
+++ b/src/main/java/org/symphonyoss/symphony/messageml/elements/RegexElement.java
@@ -92,6 +92,10 @@ default Map<String, String> getRegexAttrForPresentationML(){
       presentationAttrs.put(PRESENTATIONML_PATTERN_ERROR_MESSAGE_ATTR, getAttribute(PATTERN_ERROR_MESSAGE_ATTR));
     }
 
+    if (getAttribute(PRESENTATIONML_PATTERN_ERROR_MESSAGE_ATTR) != null) {
+      presentationAttrs.put(PRESENTATIONML_PATTERN_ERROR_MESSAGE_ATTR, getAttribute(PRESENTATIONML_PATTERN_ERROR_MESSAGE_ATTR));
+    }
+
     return presentationAttrs;
   }
 
@@ -101,7 +105,7 @@ default Map<String, String> getRegexAttrForPresentationML(){
    */
   default Map<String, String> getOtherAttributes(){
     Map<String, String> presentationAttrs = new LinkedHashMap<>(getAttributes());
-    ALL_REGEX_ATTRS.stream().forEach(attr -> presentationAttrs.remove(attr));
+    ALL_REGEX_ATTRS.forEach(presentationAttrs::remove);
     return presentationAttrs;
   }
 
diff --git a/src/test/resources/examples/form.xml b/src/test/resources/examples/form.xml
index e81fb62f..51f8c39c 100644
--- a/src/test/resources/examples/form.xml
+++ b/src/test/resources/examples/form.xml
@@ -58,7 +58,7 @@
 
         <h5>Text Fields</h5>
         <text-field name="name" placeholder="Input your name..." required="true"/>
-        <text-field name="age" placeholder="Text field with a tool tip" title="What's your age?"/>
+        <text-field name="age" placeholder="Text field with a tool tip" title="What's your age?" pattern="(^[0-9,]+$|^$)" pattern-error-message="Please input numbers."/>
 
         <br/>