Issue #1093