Issue #1216 with unit test