Fix Implementation of locomotion states