Issue #2599