Ah good point. I'll try and come up with a better fix in another PR.