Issue #5109: Correct the wrong way