Fix #1486 for v1.2.5
Merge pull request #1491 from dreamsxin/bug_1486

Fix #1486 for v1.2.5