Fixed. Intentionally didn't amend the commit as that would have caused conflicts in the PRs that based on this one