Fix #1664
Test case for #1664
Updated CHANGELOG