fix async calls