NPC Problem fix for GearSwap and Shortcuts