Fix #1185
Merge pull request #1186 from xWhiteTiger/master

Fix #1185