State Bug fixed