.fix some bug