This is out of the scope of the PR - Fixing something like that would require a different PR.