Fix NPCs for real?