Issue #1047