Fixing bactching with custom packages

From #3