Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -rc71859467ae9ff4058d9fc4abeae23ee86a7cb69 -re5713fcc4511a625434a4748f7dded3d237acdf8
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision c71859467ae9ff4058d9fc4abeae23ee86a7cb69)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
@@ -7,8 +7,8 @@
 *
 * @file    ModeFill.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      11-May-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  19-Nov-2019
@@ -217,7 +217,7 @@
 U32 transitionToFillMode( void )
 {
     initFillMode();
-
+    setCurrentSubState( NO_SUB_STATE );
     // Set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );