Fix on force move! :D