Not that I know of. I can look into this for a separate pull request though.