Fixed async issue