Fix #1486 for v1.3.0
Merge pull request #1492 from dreamsxin/bug_1486_1.3.0

Fix #1486 for v1.3.0