diff --git a/Swift/blocks/class/bool-parameters-fields.twig b/Swift/blocks/class/bool-parameters-fields.twig
index 49206c7..0ad81b8 100644
--- a/Swift/blocks/class/bool-parameters-fields.twig
+++ b/Swift/blocks/class/bool-parameters-fields.twig
@@ -1,9 +1,13 @@
 {%- import '../../macroses/common.utils.twig' as utils -%}
 
 {%- if fields is not empty -%}
+	{%- set nullableOptionalFields = [] -%}
     {%- for field in fields -%}
         {%- if field.nullable or field.optional -%}
-            {{ field.name }}: Bool = false{%- if not (loop.last) %}, {% endif %}
+        	{%- set nullableOptionalFields = nullableOptionalFields|merge([field]) -%}
         {%- endif -%}
     {%- endfor -%}
+    {%- for field in nullableOptionalFields -%}
+    	{{ field.name }}: Bool = false{%- if not (loop.last) %}, {% endif %}
+    {%- endfor -%}
 {%- endif -%}
\ No newline at end of file
diff --git a/Swift/macroses/common.utils.twig b/Swift/macroses/common.utils.twig
index 3945100..354ce6b 100644
--- a/Swift/macroses/common.utils.twig
+++ b/Swift/macroses/common.utils.twig
@@ -40,7 +40,7 @@
     {%- elseif field.type.type.baseTypeName == "StringDecimal" -%}
         {{- self.formatEncodingStringDecimal(field) -}}
     {%- elseif field.type.type.baseTypeName == "Decimal" -%}
-        {{ self.formatFieldName(field.name, isStrongLinkCaptured) -}}.decimalValue
+        {{ self.formatFieldName(field, isStrongLinkCaptured) -}}.decimalValue
     {%- elseif field.type.type.baseTypeName == "DateTimeTimestamp" -%}
         Int({{ self.formatFieldName(field, isStrongLinkCaptured) -}}.timeIntervalSince1970)
     {%- elseif field.type.type.baseTypeName == "Color" -%}