Sure. I merged this too fast to see your comments, but opened a new PR with test and cosmetic fix.