Fix async loading