Fixed async issues