Issue #1114