GearSwap - Minor Validate fix