diff --git a/CHANGELOG.md b/CHANGELOG.md
index acef974..6b6decf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.1.5"></a>
+# [1.1.5](https://github.com/flextype-plugins/form/compare/v1.1.4...v1.1.5) (2020-06-23)
+
+### Bug Fixes
+
+* **fieldsets:** fix form messages on submit
+
 <a name="1.1.4"></a>
 # [1.1.4](https://github.com/flextype-plugins/form/compare/v1.1.3...v1.1.4) (2020-06-21)
 
diff --git a/README.md b/README.md
index 238a6ad..e0ad1a0 100755
--- a/README.md
+++ b/README.md
@@ -73,7 +73,7 @@ form:
   name: default
   id: default
   method: post
-  message:
+  messages:
     success: true
     error: true
   buttons:
diff --git a/fieldsets/base.html b/fieldsets/base.html
index cc7fec2..f762388 100644
--- a/fieldsets/base.html
+++ b/fieldsets/base.html
@@ -31,7 +31,7 @@
         {% include "plugins/form/fieldsets/single-form.html" %}
     {% endif %}
 
-    {% if not fieldset.form.messages.success %}
+    {% if fieldset.form.messages.success %}
         {% for message in flash()['success'] %}
             <div class="form-message-success">
                 {{ message }}
@@ -39,7 +39,7 @@
         {% endfor %}
     {% endif %}
 
-    {% if not fieldset.form.messages.error %}
+    {% if fieldset.form.messages.error %}
         {% for message in flash()['error'] %}
             <div class="form-message-error">
                 {{ message }}
diff --git a/plugin.yaml b/plugin.yaml
index e9b612f..c092ef5 100755
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -1,5 +1,5 @@
 name: Form
-version: 1.1.4
+version: 1.1.5
 description: Form Plugin to render user forms for Flextype.
 icon: fas fa-check-circle
 author: