I've applied this. Thanks for the patch. Though I do wonder: it's functionally the same as before, right? What instances lead to this being an issue? Or did this way just seem more correct?