fixing bugs with resolve, race, and all