Fix the problem cause by update ADT