Issue #1052