diff --git a/xos/synchronizer/steps/helpers.py b/xos/synchronizer/steps/helpers.py
index 5a3eda9..1f53674 100644
--- a/xos/synchronizer/steps/helpers.py
+++ b/xos/synchronizer/steps/helpers.py
@@ -23,7 +23,7 @@
             return 'http://%s' % url
     @staticmethod
     def get_onos_fabric_service():
-        fabric_service = Service.objects.get(name="fabric") # TODO understand why FabricService.leaf_model is still FabricService and not service
+        # FIXME do not select by name but follow ServiceDependency
+        fabric_service = Service.objects.get(name="fabric")
         onos_fabric_service = fabric_service.subscriber_services[0].leaf_model
-
         return onos_fabric_service
\ No newline at end of file