this fix is present twice in fact, so when I merge the p-r #13 I'll rebase this p-r and that should resolve the problem.