Fixed async version