Fix infinite move() loop
Fix infinite move() loop