Issue #1042