diff --git a/syringefilled.cpp b/syringefilled.cpp
index 3b30249caafc58a76da4e5802e88b2613727d019..d417e7b047e3fce176742cfe2d40267dce890ab8 100644
--- a/syringefilled.cpp
+++ b/syringefilled.cpp
@@ -270,12 +270,12 @@ void SyringeFilled :: start_exchange()
     if (get_push()) //If we want to deliver some liquid
     {
         reset_position();
-        move_to_mm_limit_switch(_clockwise_equals_push? volume_mL_to_distance_mm(get_exchange_volume_mL()): -volume_mL_to_distance_mm(get_exchange_volume_mL()));
+        move_to_mm_limit_switch((get_clockwise_equals_forward()==get_clockwise_equals_push())? volume_mL_to_distance_mm(get_exchange_volume_mL()): -volume_mL_to_distance_mm(get_exchange_volume_mL()));
     }
     else //If we want to recover some liquid
     {
         reset_position();
-        move_to_mm_limit_switch(_clockwise_equals_push? -volume_mL_to_distance_mm(get_exchange_volume_mL()): volume_mL_to_distance_mm(get_exchange_volume_mL()));
+        move_to_mm_limit_switch((get_clockwise_equals_forward()==get_clockwise_equals_push())? -volume_mL_to_distance_mm(get_exchange_volume_mL()): volume_mL_to_distance_mm(get_exchange_volume_mL()));
     }