--- src/ui.vala~	2016-11-28 10:07:21.000000000 +0000
+++ src/ui.vala	2017-03-24 08:06:25.719227199 +0000
@@ -453,7 +453,11 @@
                 for (i = 0; i < n_delete; i++)
                 {
                     device_model.iter_nth_child (out iter, null, index);
+                    #if VALA_0_36
+                    device_model.remove (ref iter);
+                    #else
                     device_model.remove (iter);
+                    #endif
                 }
             }
             else
@@ -466,7 +470,11 @@
 
         /* Remove any remaining devices */
         while (device_model.iter_nth_child (out iter, null, index))
+            #if VALA_0_36
+            device_model.remove (ref iter);
+            #else
             device_model.remove (iter);
+            #endif
 
         /* Select the previously selected device or the first available device */
         if (!have_selection)