fix some bug: