Fix a bug in last commit 958acece2cfad57d8626ff775991002bb90964e2.
Merge branch 'v1.3.x'