Not actually par of this PR from a "conceptual" point of view, but I have spotted this recently, so I think it makes sense fixing it.

NTC