Issue #1039