Be more strict in state recognition.