* fix some bug