Issue #1118