I made sure the tests you added on that PR, are still passing. So, we either need to add more regression tests, or this is correct.