GearSwap: Fix the fixes
GearSwap - newmain
Merge pull request #963 from Windower/4.1-dev

GearSwap - subjob change fix