Fixed a bug where the state doesn't change to one state
Merge branch 'master' of https://github.com/Ourobor/petulant-batman