Agree with that, I'll provide a new PR soon.