Fixed ASync weirdness