Fix #1983
Test case
Updated CHANGELOG
Merge pull request #1984 from sjinks/issue-1983

Fix #1983