Fix second pass not getting some updates