fix movement order