fixed for async version >= 0.6