I'll make a comment - nope, it handles this properly, admit that this piece of code needs to be fixed, but it was like this before and this branch is just moving it around.