diff --git a/src/pystencils_autodiff/walberla.py b/src/pystencils_autodiff/walberla.py
index 9d272eaf9e7df12a1b4a16d9a8bd734b5bd45d68..b4c18414a2532bcf53a2c9eaa3097869cd4fa048 100644
--- a/src/pystencils_autodiff/walberla.py
+++ b/src/pystencils_autodiff/walberla.py
@@ -157,10 +157,10 @@ class FieldAllocation(JinjaCppFile):
 
     TEMPLATE = jinja2.Template("""BlockDataID {{ field_name }}_data = field::addToStorage<{{ field_type }}>( {{ block_forrest }},
                               {{ field_name }}
-     {%- if init_value %}      , {{ init_value }} {% endif %}
-     {%- if layout_str %}      , {{ layout_str }} {% endif %}
-     {%- if num_ghost_layers %}, {{ num_ghost_layers }} {% endif %}
-     {%- if always_initialize %}, {{ always_initialize }} {% endif %})
+     {%- if init_value -%}      , {{ init_value }} {% endif %}
+     {%- if layout_str -%}      , {{ layout_str }} {% endif %}
+     {%- if num_ghost_layers -%}, {{ num_ghost_layers }} {% endif %}
+     {%- if always_initialize -%}, {{ always_initialize }} {% endif %})
         """)  # noqa
 
     def __init__(self, block_forrest, field):