AP11 -186 bug fix