Actually fix the problem rather than making a second pass.