GearSwap - job change fix