fix some thing