this version fixes the asynchronous loading issue