diff -Nru indi-astromechfoc-0.2~202201190752~ubuntu21.04.1/debian/changelog indi-astromechfoc-0.2~202201200751~ubuntu21.04.1/debian/changelog
--- indi-astromechfoc-0.2~202201190752~ubuntu21.04.1/debian/changelog	2022-01-19 07:52:11.000000000 +0000
+++ indi-astromechfoc-0.2~202201200751~ubuntu21.04.1/debian/changelog	2022-01-20 07:51:37.000000000 +0000
@@ -1,8 +1,8 @@
-indi-astromechfoc (0.2~202201190752~ubuntu21.04.1) hirsute; urgency=low
+indi-astromechfoc (0.2~202201200751~ubuntu21.04.1) hirsute; urgency=low
 
   * Auto build.
 
- -- Jasem Mutlaq <mutlaqja@ikarustech.com>  Wed, 19 Jan 2022 07:52:11 +0000
+ -- Jasem Mutlaq <mutlaqja@ikarustech.com>  Thu, 20 Jan 2022 07:51:37 +0000
 
 indi-astromechfoc (0.2) bionic; urgency=low
 
diff -Nru indi-astromechfoc-0.2~202201190752~ubuntu21.04.1/debian/git-build-recipe.manifest indi-astromechfoc-0.2~202201200751~ubuntu21.04.1/debian/git-build-recipe.manifest
--- indi-astromechfoc-0.2~202201190752~ubuntu21.04.1/debian/git-build-recipe.manifest	2022-01-19 07:52:11.000000000 +0000
+++ indi-astromechfoc-0.2~202201200751~ubuntu21.04.1/debian/git-build-recipe.manifest	2022-01-20 07:51:37.000000000 +0000
@@ -1,5 +1,5 @@
-# git-build-recipe format 0.4 deb-version {debupstream}~202201190752
+# git-build-recipe format 0.4 deb-version {debupstream}~202201200751
 lp:~mutlaqja/+git/dummy git-commit:9a182f35d7f48b02de1170889c0798f3ab639afb
-nest-part src lp:~mutlaqja/libindi/+git/trunk indi-astromechfoc indi-astromechfoc git-commit:499827d458bef280b633dd558b3e93ec0f04518b
-nest-part cmake lp:~mutlaqja/libindi/+git/trunk cmake_modules indi-astromechfoc/cmake_modules git-commit:499827d458bef280b633dd558b3e93ec0f04518b
-nest-part pack lp:~mutlaqja/libindi/+git/trunk debian/indi-astromechfoc debian git-commit:499827d458bef280b633dd558b3e93ec0f04518b
+nest-part src lp:~mutlaqja/libindi/+git/trunk indi-astromechfoc indi-astromechfoc git-commit:788b2001dff117d645f231ef3a7215efc84e76dc
+nest-part cmake lp:~mutlaqja/libindi/+git/trunk cmake_modules indi-astromechfoc/cmake_modules git-commit:788b2001dff117d645f231ef3a7215efc84e76dc
+nest-part pack lp:~mutlaqja/libindi/+git/trunk debian/indi-astromechfoc debian git-commit:788b2001dff117d645f231ef3a7215efc84e76dc
diff -Nru indi-astromechfoc-0.2~202201190752~ubuntu21.04.1/indi-astromechfoc/astromech_focuser.cpp indi-astromechfoc-0.2~202201200751~ubuntu21.04.1/indi-astromechfoc/astromech_focuser.cpp
--- indi-astromechfoc-0.2~202201190752~ubuntu21.04.1/indi-astromechfoc/astromech_focuser.cpp	2022-01-19 07:52:07.000000000 +0000
+++ indi-astromechfoc-0.2~202201200751~ubuntu21.04.1/indi-astromechfoc/astromech_focuser.cpp	2022-01-20 07:51:33.000000000 +0000
@@ -29,6 +29,9 @@
 #include <memory>
 #include <cstring>
 #include <unistd.h>
+#include <termios.h>
+#include <chrono>
+#include <thread>
 
 static std::unique_ptr<astromechanics_foc> Astromechanics_foc(new astromechanics_foc());
 
@@ -123,7 +126,6 @@
 ************************************************************************************/
 bool astromechanics_foc::Handshake()
 {
-    char FOC_cmd[32] = "P#";
     char FOC_res[32] = {0};
     int FOC_pos_measd = 0;
     int nbytes_written = 0;
@@ -131,22 +133,22 @@
 
     LOG_DEBUG("Handshake");
 
-    tty_write_string(PortFD, FOC_cmd, &nbytes_written);
-    LOGF_INFO("CMD <%s>", FOC_cmd);
-    if (tty_read_section(PortFD, FOC_res, '#', FOCUS_TIMEOUT, &nbytes_read) == TTY_OK)
+    for (int i = 0; i < 3; i++)
     {
-        LOGF_DEBUG("RES (%s)", FOC_res);
-        sscanf(FOC_res, "%d#", &FOC_pos_measd);
-        LOGF_INFO("Set to absolute focus position (%d)", FOC_pos_measd);
-        FocusAbsPosN[0].value = FOC_pos_measd;
-        FocusAbsPosNP.s = IPS_OK;
+        tcflush(PortFD, TCIOFLUSH);
+        tty_write_string(PortFD, "P#", &nbytes_written);
+        if (tty_read_section(PortFD, FOC_res, '#', FOCUS_TIMEOUT, &nbytes_read) == TTY_OK)
+        {
+            LOGF_DEBUG("RES (%s)", FOC_res);
+            sscanf(FOC_res, "%d#", &FOC_pos_measd);
+            LOGF_INFO("Set to absolute focus position (%d)", FOC_pos_measd);
+            FocusAbsPosN[0].value = FOC_pos_measd;
+            FocusAbsPosNP.s = IPS_OK;
+            SetApperture(0);
+            return true;
+        }
 
-        SetApperture(0);
-        return true;
-    }
-    else
-    {
-        LOG_ERROR("ERROR HANDSHAKE");
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
     }
 
     return false;
diff -Nru indi-astromechfoc-0.2~202201190752~ubuntu21.04.1/indi-astromechfoc/indi-astromechfoc.spec indi-astromechfoc-0.2~202201200751~ubuntu21.04.1/indi-astromechfoc/indi-astromechfoc.spec
--- indi-astromechfoc-0.2~202201190752~ubuntu21.04.1/indi-astromechfoc/indi-astromechfoc.spec	2022-01-19 07:52:07.000000000 +0000
+++ indi-astromechfoc-0.2~202201200751~ubuntu21.04.1/indi-astromechfoc/indi-astromechfoc.spec	2022-01-20 07:51:33.000000000 +0000
@@ -1,6 +1,6 @@
 %define __cmake_in_source_build %{_vpath_builddir}
 Name: indi-astromechfoc
-Version:1.9.4.git
+Version:1.9.5.git
 Release: %(date -u +%%Y%%m%%d%%H%%M%%S)%{?dist}
 Summary: Instrument Neutral Distributed Interface 3rd party drivers