fixed loading issue