fixed the "not really moving, yet moving" problem
(not the optimal solution I gues)