Fixed ugly async bug