修复BUG
refact and bugfix