Would be great if we could get the pull request with just this improvement and not the one below