diff --git a/S3/CloudFront.py b/S3/CloudFront.py
index 42ea4f2f6..e1ec668f5 100644
--- a/S3/CloudFront.py
+++ b/S3/CloudFront.py
@@ -577,9 +577,9 @@ def _fail_wait(self, retries):
         return (self._max_retries - retries + 1) * 3
 
     def get_dist_name_for_bucket(self, uri):
-        if (uri.type == "cf"):
-            return uri
-        if (uri.type != "s3"):
+        if uri.type == "cf":
+            return [uri]
+        if uri.type != "s3":
             raise ParameterError("CloudFront or S3 URI required instead of: %s" % uri)
 
         debug("_get_dist_name_for_bucket(%r)" % uri)