@jvkersch BTW, those corner cases are fixed in the next PR I will submit once that one is reviewed and merged