diff --git a/src/iris_diaphragm.py b/src/iris_diaphragm.py
index c9d1deac80772d546bfff11c83ed4b99ae7ee7f8..6d5fd9099cc7030832ed608f450385047bb539fd 100755
--- a/src/iris_diaphragm.py
+++ b/src/iris_diaphragm.py
@@ -59,7 +59,7 @@ class IrisDiaphragm (PyTango.Device_4Impl):
         try:
             # ctrl_proxy device to SmarAct MCS Controller
             self.ctrl_proxy = PyTango.DeviceProxy(self.SmaractMCSDevice)
-            if self.ctrl_proxy.state() != PyTango.DevState.ON:
+            if self.ctrl_proxy.state() not in (PyTango.DevState.ON, PyTango.DevState.MOVING,):
                 self.set_state(PyTango.DevState.FAULT)
                 self.status_string = "ctrl_proxy device not in ON state. INIT failed."
                 return
@@ -229,7 +229,8 @@ class IrisDiaphragm (PyTango.Device_4Impl):
         :return:
         :rtype: PyTango.DevVoid """
         # self.debug_stream("In Open()")
-        self.execute_command("GoToHighLimit")
+        # self.execute_command("GoToHighLimit")
+        self.write_position(22.0)
 
     def is_Open_allowed(self):
         return self.get_state() in (PyTango.DevState.ON,)
@@ -241,7 +242,8 @@ class IrisDiaphragm (PyTango.Device_4Impl):
         :return:
         :rtype: PyTango.DevVoid """
         # self.debug_stream("In Close()")
-        self.execute_command("GoToLowLimit")
+        # self.execute_command("GoToLowLimit")
+        self.write_position(0.0)
 
     def is_Close_allowed(self):
         return self.get_state() in (PyTango.DevState.ON,)