Fix #1470
Merge pull request #1471 from sjinks/issue-1470

Fix 1470