diff --git a/juniper-macros.j2 b/juniper-macros.j2
index a5a4f8b..e4242d6 100644
--- a/juniper-macros.j2
+++ b/juniper-macros.j2
@@ -110,10 +110,10 @@ chassis {
             }
         }
 {% endif %}
-{% if interface.ip_addresses.all()|length > 0 %}
+{% if interface.ip_addresses.count() > 0 %}
         unit 0 {
             family inet {
-                {% if interface.ip_addresses[0].status == 'reserved' %}inactive: {% endif %}address {{ interface.ip_addresses[0].address }};
+                {% if interface.ip_addresses.first().status == 'reserved' %}inactive: {% endif %}address {{ interface.ip_addresses.first().address }};
             }
         }
 {% endif %}
@@ -165,7 +165,7 @@ interfaces {
         unit {{ interface.name[4:] }} {
             description "{{ interface.description }}";
             family inet {
-                {% if interface.ip_addresses[0].status == 'reserved' %}inactive: {% endif %}address {{ interface.ip_addresses[0].address }};
+                {% if interface.ip_addresses.first().status == 'reserved' %}inactive: {% endif %}address {{ interface.ip_addresses.first().address }};
             }
         }
 {% if loop.last %}