agreed, but I won't do that in this PR...