Fix #1999
Merge pull request #2014 from sjinks/issue-1999

Fix #1999