Fix blocking issues in async usage