Fix #1485
Merge pull request #1488 from sjinks/issue-1485

Fix #1485