Issue #1045