Fix BUG #1536
Merge pull request #1544 from dreamsxin/1536

Fix BUG #1536