This looks like a separate bug fix, which is fine.