OK, I'll take a look at that and update the pull if it works in our testing.