@fancy-queen-20734: I have a patch that solves the problem. I am going to look into how hard it will be to add a test and then I will send a RB for you to take a look at.