Fixed support for async tasks