Issue #1366