Fix bug #1663
Merge pull request #1702 from dreamsxin/bug_1663_1.3.0

Fix bug #1663