Fix issue with async listeners