Took a look at finding this and I have a fix for this general problem here locally. I can merge the pull request and add that fix to it if you would prefer that?