Fixed async stuff