Fix BUG #1022 for 1.3.0
Merge pull request #1028 from dreamsxin/bug_1022_1.3.0

Fix BUG #1022 1.3.0