Also the test you add seems to be unrelated to this change, if this is correct, add tests for this change please.