Bug fixing AC/WTP crash