Fixed problem with packages that span multiple pages