Fix racing resolvers