diff --git a/utils/he_ipv6/tpl/dnsmasq.include.j2 b/utils/he_ipv6/tpl/dnsmasq.include.j2
index 6e311d5..113b343 100644
--- a/utils/he_ipv6/tpl/dnsmasq.include.j2
+++ b/utils/he_ipv6/tpl/dnsmasq.include.j2
@@ -33,10 +33,13 @@ listen-address = {{ assignment.iface_ll }}
 ra-param = {{ assignment.iface }}, mtu:{{ common_opts.mtu }}, high, {{ common_opts.min_delay }}, {{ common_opts.lifetime }}
 	{%- if assignment.ra_dhcp %}
 		{%- for block in assignment.iface_blocks %}
+			{%- if loop.index0 == 0 %}
 dhcp-range = {{ id_set }}, {{ assignment.dhcp6_ranges[assign_loop.index0]|join(', ') }}, {{ ra_opts|join(', ') }}, {{ common_opts.lease_life }}
+			{%- else %}
+dhcp-range = {{ identifier }}, {{ assignment.dhcp6_ranges[assign_loop.index0]|join(', ') }}, {{ ra_opts|join(', ') }}, {{ common_opts.lease_life }}
 		{%- endfor %}
 	{%- else %}
-dhcp-range = {{ id_set }}, [::], constructor={{ assignment.iface }}, {{ ra_opts|join(', ') }}, {{ common_opts.lease_life }}{#- TODO: check this. #}
+dhcp-range = {{ id_set }}, ::, {{ ra_opts|join(', ') }}, {{ common_opts.lease_life }}{#- TODO: check this. #}
 	{%- endif %}
 dhcp-option = {{ identifier }}, option6:information-refresh-time, {{ common_opts.opts_life }}
 	{%- if assignment.ra_dns %}