Awaiter implementation fix