fix async stuff