[TAC-27] solve some bugs