Correct state detection to work with the normal state.