fix bug(v1.2.1)
Merge branch 'v1.2.1'