Fix #1828
Test case for #1828
Added CHANGELOG
Merge pull request #1831 from sjinks/issue-1828

Fix #1828