Issue #8265 by tj: Corrected