Issue #1096