diff --git a/Common/Libraries/IRALibrary/src/IRAPy/Connection.py b/Common/Libraries/IRALibrary/src/IRAPy/Connection.py
index 0294b49907eadc7647932788861f1655f9d62cc5..6b10dba7ce2174a05ff18d82543dc24a8856770f 100644
--- a/Common/Libraries/IRALibrary/src/IRAPy/Connection.py
+++ b/Common/Libraries/IRALibrary/src/IRAPy/Connection.py
@@ -22,12 +22,13 @@ class Connection(object):
 
     def __init__(self, address, timeout=2):
         self.address = address
+        self.timeout = timeout
 
     def __enter__(self):
         self.s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         connected = 1
         t0 = time.time()
-        while time.time() - t0 < timeout:
+        while time.time() - t0 < self.timeout:
             connected = self.s.connect_ex(self.address)
             if connected == 0:
                 break