This looks like a good bug fix, but unrelated to the rest of the patch. Can you confirm?