fix logical bug on movement mode