Fix not being used for AR >= 4