[FIX]repare some bugs