fixed the loading issue