Revert "Fixed state bug"

This reverts commit 464e3bbb49200c84c9fa92fe65fdc2c5014ea0b7.
Fixed state bug