Fix Issue #8175