I have a commit to fix this issue. Will make a pull request when I can extract it from other gubbins.