[cainetighe]

I've pushed some changes out for this. I'd appreciate if you could confirm it works as expected now.