Agreed, but outside scope of this pull request as was like that before.