Was this a pre-existing bug? You might want to pull it out as a separate commit