Issue #1044