Fix issue with async dispatch