Fixed NPC movement