@MrNoodle I've made commit b9a2eed08c3fc91dfcf801f10dacf6cdeaba369f over on the main 2.x branch to fix this. Can back it out if it turns out to be a mistake.