Issue #1046