Fix #1919
Merge pull request #1922 from inDream/master

Fix #1919