Fix for AR 3.2.x