Fix #1849
Merge pull request #1850 from sjinks/patch-1

Fix #1849