Fixing start state bug