Issue #1088