I'll change it in another PR. Let's not delay this anymore.