fixing partial loading issue