Fixed Motion state bug