Issue #2588