Change: fix some bug