yeh that seems problematic - if you’re in a position to fix/test/submit a PR would be happy to take a look.