Test case for #1457
Fix #1457
Merge pull request #1459 from sjinks/issue-1457

Fix #1457