diff --git a/cactus/deployment/s3/engine.py b/cactus/deployment/s3/engine.py
index 3381eade..bd779c12 100644
--- a/cactus/deployment/s3/engine.py
+++ b/cactus/deployment/s3/engine.py
@@ -65,9 +65,8 @@ def get_bucket(self):
         :returns: The Bucket if found, None otherwise.
         :raises: InvalidCredentials if we can't connect to AWS
         """
-        buckets = self._get_buckets()
-        buckets = dict((bucket.name, bucket) for bucket in buckets)
-        return buckets.get(self.bucket_name)
+        s3con = self.get_connection()
+        return s3con.get_bucket(self.bucket_name)
 
     def create_bucket(self):
         """