Fix Issue #23525