try to fix some bugs
try to fix some bugs