Fix async handling