[MISC] fix bugs
[MISC] fix bugs