Fix the state machine for realsies.