Fix bug #1222
Updated
Merge pull request #1229 from dreamsxin/1222

Fix BUG  1222