fix some bug1