GearSwap - targets fix