Fixed the loading issue