Fix NPC movement