I took the lazy way out and use a dependency for that. I’ll look into it and see if I can either push a fix upstream or reimplement myself.