fix some bugs
hotfix
hot fix
hot fix