* commit '7e7f2b4de003bd5aeef04500025cb2bc34e6df28': Use actual number of packages rather than getCount()