Yes, you are probably right - I'll open a new PR with that.