diff --git a/sensu/files/sensu.conf b/sensu/files/sensu.conf
index 6a7b1b1..4c59cdc 100644
--- a/sensu/files/sensu.conf
+++ b/sensu/files/sensu.conf
@@ -24,17 +24,17 @@
   subscribers:
   - local-sensu-dashboard
 {%- if client.get('plugin', {}).network_monitoring is defined %}
-{%- for device_name, device in client.network_device.iteritems() %}
-{%- for interface_name, interface in device.interface.iteritems() %}
-remote_{{ device_name }}_{{ interface_name|replace('/', '_')|replace('.', '_') }}_interface_up:
-  command: "/etc/sensu/plugins/check_snmp_int.pl -H {{ device.management.address }} -C {{ device.community }} -n ^{{ interface_name }}$"
+{%- for device_name in client.network_device.iteritems() %}
+{%- for interface_name in device_name.interface.iteritems() %}
+remote_{{ device_name }}_{{ interface_name|replace('/', '_') }}_interface_up:
+  command: "/etc/sensu/plugins/check_snmp_int.pl -H {{ device_name.management.address }} -C {{ device_name.community }} -n ^{{ interface_name }}$"
   interval: 60
   occurrences: 1
   subscribers:
   - remote-network
-{%- for subinterface_name, subinterface in device.interface.{{ interface_name }}.iteritems() %}
+{%- for subinterface_name in device.interface.{{ interface_name }}.subinterface.iteritems() %}
 remote_{{ device_name }}_{{ subinterface_name|replace('/', '_')|replace('.', '_') }}_interface_up:
-  command: "/etc/sensu/plugins/check_snmp_int.pl -H {{ device.management.address }} -C {{ device.community }} -n ^{{ subinterface_name }}$"
+  command: "/etc/sensu/plugins/check_snmp_int.pl -H {{ device_name.management.address }} -C {{ device_name.community }} -n ^{{ subinterface_name }}$"
   interval: 60
   occurrences: 1
   subscribers: