Issue #1117