fix bug v1.3.0
Merge branch 'v1.3.0'