I've made a fix for this on the test site (which you're welcome to try out). I'll put it live once I've tested a few other things that are on the test site too.

Thanks

Joe