AP11-102 Bug fixing