fix some bugs again.