Was always bothered by this ... not specifically related to this PR btw !