Fixed NPC companion bug

At least for NPC 8996 and 6250