Issue #2567