Fix async as well