diff --git a/templates/named.conf.controls.j2 b/templates/named.conf.controls.j2
index 867c347..f36080e 100644
--- a/templates/named.conf.controls.j2
+++ b/templates/named.conf.controls.j2
@@ -1,7 +1,6 @@
-{% macro controls(controls) %}
 controls {
 {% filter indent(bind9_config_indent, true) %}
-{% for control in controls %}
+{% for control in item.controls %}
 {% if control.type == "inet" %}
 {{ ('inet ' + control.address) -}}
 {{ (' port ' + control.port | string) if control.port is defined and control.port -}}
@@ -16,4 +15,3 @@ controls {
 {{ (' read-only ' + control.read_only | string) if control.read_only is defined -}};
 {% endfor %}};
 {% endfilter %}
-{% endmacro %}
\ No newline at end of file
diff --git a/templates/named.conf.generator.j2 b/templates/named.conf.generator.j2
index 338a5bd..cf262c4 100644
--- a/templates/named.conf.generator.j2
+++ b/templates/named.conf.generator.j2
@@ -15,8 +15,7 @@ options {
 {% include 'named.conf.primaries.j2' %}
 {% endif %}
 {% if item.controls is defined and item.controls %}
-{% from 'named.conf.controls.j2' import controls with context %}
-{{ controls(item.controls) }}
+{% include 'named.conf.controls.j2' %}
 {% endif %}
 {% if item.include is defined and item.include %}
 {% from 'named.conf.include.j2' import include with context %}