Issue #2451