put back changes that got overwritten on a timing issue