Merge pull request #6518 from nabinhait/ar_ap_fix

Minor fix AR/AP