Test case for #1919
Fix #1919
Updated CHANGELOG
Merge pull request #1920 from sjinks/issue-1919

Fix #1919