Fixed for GEAR_ARCH