Issue #2498