Adjust for async listen