Fix package data bundling