fixed long loading issue