That would be also nice to get rid of, but that not scope of this PR.