Issue #1095