Improve stability of state switching in rapid succession