Fix StateResolver and isWinState method