diff --git a/ArduCopter/control_modes.pde b/ArduCopter/control_modes.pde
index c443158bcd..94b6f7e3be 100644
--- a/ArduCopter/control_modes.pde
+++ b/ArduCopter/control_modes.pde
@@ -14,11 +14,11 @@ static void read_control_switch()
 
 			set_mode(flight_modes[switchPosition]);
 
-			#if CH7_OPTION != CH7_SIMPLE_MODE
+			if(g.ch7_option == CH7_SIMPLE_MODE){
 				// setup Simple mode
 				// do we enable simple mode?
 	            do_simple = (g.simple_modes & (1 << switchPosition));
-			#endif
+			}
 		}else{
 			switch_debouncer 	= true;
 		}