#5 fix some bug