fix some bug
d