fix some bugs ever fixed.