Fixed manual override of state