Fixing async problem
Fixing async problem