I'm going to raise an issue in github and open a PR, I'll post the link here if further discussion is needed