Bug fixing AC/WTP sync and crash