Issue #1116