diff --git a/hooks/charmhelpers/fetch/__init__.py b/hooks/charmhelpers/fetch/__init__.py
index 792e629a..57a179b8 100644
--- a/hooks/charmhelpers/fetch/__init__.py
+++ b/hooks/charmhelpers/fetch/__init__.py
@@ -367,13 +367,15 @@ def install_remote(source, *args, **kwargs):
     # explaining why it can't handle a given source.
     handlers = [h for h in plugins() if h.can_handle(source) is True]
     installed_to = None
-    for handler in handlers:
-        try:
-            installed_to = handler.install(source, *args, **kwargs)
-        except UnhandledSource:
-            pass
-    if not installed_to:
-        raise UnhandledSource("No handler found for source {}".format(source))
+    while not installed_to:
+        for handler in handlers:
+            try:
+                installed_to = handler.install(source, *args, **kwargs)
+            except UnhandledSource:
+                pass
+            log("CB: install loop - installed_to = |%s|".format(installed_to))
+        #if not installed_to:
+        #    raise UnhandledSource("No handler found for source {}".format(source))
     return installed_to