Yup. True. Not my brightest day today. I guess the other fix is still valid so I'll push to this branch removing this commit.