You're my saviour. Will submit a PR tomorrow.