fix bugs of 1.2.1