Fix #1494
Merge pull request #1496 from sjinks/issue-1494

Fix #1494