prepare to fix some bugs