Shall I fix it in this PR? If so I'll update the PR's title.