[x] fix some bug