diff --git a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
index 31ba0ff..7029980 100644
--- a/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
+++ b/app/src/main/java/com/example/hpostesting/presentation/hemocube/HemoCubeFragment.kt
@@ -453,12 +453,25 @@ class HemoCubeFragment : Fragment() {
                 hemoCubeViewModel.messages.postValue("EPROM ADC Loaded")
                 //checkCuvettePresence()
             }
+            resultData.contains("#CIN") && sampleClick && this.testStatusCode < TestStatus.CUVETTE_PRESENTS.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
+                this.testStatusCode = TestStatus.CUVETTE_PRESENTS.code
+                activity?.runOnUiThread {
+                    checkCuvetteSam = true
+                    binding.btnRetryCheckCuvette.visibility = View.GONE
+                }
+            }
+            resultData.contains("#AIN") && sampleClick && this.testStatusCode <= TestStatus.CUVETTE_ABSENTS.code -> {
+                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
+                this.testStatusCode = TestStatus.CUVETTE_ABSENTS.code
+                showRetryButtonForCuvette()
+            }
 
             resultData.contains("#CIN") && this.testStatusCode < TestStatus.CUVETTE_PRESENT.code -> {
                 hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
                 this.testStatusCode = TestStatus.CUVETTE_PRESENT.code
-                checkCuvette = true
                 activity?.runOnUiThread {
+                    checkCuvette = true
                     binding.btnRetryCheckCuvette.visibility = View.GONE
                 }
             }
@@ -484,19 +497,7 @@ class HemoCubeFragment : Fragment() {
                 this.testStatusCode = TestStatus.BUFFER_COMPLETED.code
 
             }
-            resultData.contains("#CIN") && this.testStatusCode < TestStatus.CUVETTE_PRESENTS.code && sampleClick -> {
-                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_present))
-                this.testStatusCode = TestStatus.CUVETTE_PRESENTS.code
-                checkCuvetteSam = true
-                activity?.runOnUiThread {
-                    binding.btnRetryCheckCuvette.visibility = View.GONE
-                }
-            }
-            resultData.contains("#AIN") && this.testStatusCode <= TestStatus.CUVETTE_ABSENTS.code && sampleClick -> {
-                hemoCubeViewModel.messages.postValue(getString(R.string.cuvette_absent))
-                this.testStatusCode = TestStatus.CUVETTE_ABSENTS.code
-                showRetryButtonForCuvette()
-            }
+
             (resultData.contains("#SS") || resultData.contains("#SS1")) && this.testStatusCode < TestStatus.SAMPLE_STARTED.code -> {
                 this.testStatusCode = TestStatus.SAMPLE_STARTED.code
                 activity?.runOnUiThread {