Fix #1863
Merge pull request #1864 from Dhaulagiri/master

Fix #1863