AP11-102 bug fixing