I have a fix in a local branch. I can submit a PR but I need #114 as a prerequisite (very painful to test on mac without it).