Fix loading issue