Issue #1115