some bug
fix some bug