Issue #2541