Is this an unrelated bug fix?