Fix #2096
Test case for #2096