* commit '498883d4f21b8525973aefa30cadcde7e3d1684b': Use actual number of packages rather than getCount()