Issue #2501