Ok, I think in my latest commit I fixed this. Can you take a look?