Fixed core motion bug