diff --git a/cassandra/connection.py b/cassandra/connection.py
index bfe38fc702..04d852a9e3 100644
--- a/cassandra/connection.py
+++ b/cassandra/connection.py
@@ -236,8 +236,17 @@ def create(self, row):
 
         # create the endpoint with the translated address
         # TODO next major, create a TranslatedEndPoint type
+        ## Overriden by Pandu. using ip + port translation
+        translated_address = self.cluster.address_translator.translate(addr)
+        log.debug("PANDU: translated address {}".format(translated_address))
+        if type(translated_address) is tuple and len(translated_address)>1:
+            ip = translated_address[0]
+            port = translated_address[1]
+            log.debug( "PANDU: CREATING Default endpoint {} {}".format(ip, port))
+        else:
+            ip = translated_address
         return DefaultEndPoint(
-            self.cluster.address_translator.translate(addr),
+            ip,
             port)