Fix #1466
Merge pull request #1469 from sjinks/issue-1466

Fix #1466