Stop failing and correctly fix async version