fix some bug in 1.2.0