Fix async prroblem