Fixed AAF Gear issue