goddamn async issue fix