Fix 'move' bug