Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r98e9ba4e9e7e2bf97ad5240c2a77efeefe9605e1 -rba6530b83f85452382325b97eae02d9e7e5c1cb1
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 98e9ba4e9e7e2bf97ad5240c2a77efeefe9605e1)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision ba6530b83f85452382325b97eae02d9e7e5c1cb1)
@@ -399,7 +399,7 @@
         currentValveStates[ valve ].homingOperationActive = FALSE;
         currentValveStates[ valve ].hasValveBeenHomed = TRUE;
         currentValveStates[ valve ].commandedPosition = VALVE_POSITION_C_CLOSE;
-        currentValveStates[ valve ].currentPosition   = VALVE_POSITION_C_CLOSE;
+        currentValveStates[ valve ].currentPosition   = VALVE_POSITION_C_CLOSE; // TODO: Later
         nextState = VALVE_STATE_IDLE;
     }
     else if ( ( TRUE == currentValveStates[ valve ].homingOperationActive ) &&
@@ -447,6 +447,13 @@
             nextState                                              = VALVE_STATE_IN_TRANSITION;
         }
     }
+    else
+    {
+        if ( getValvePositionError( valve ) > 15 )
+        {
+            setValvePosition( valve, currentValveStates[ valve ].commandedPosition );
+        }
+    }
 
     return nextState;
 }