Packaging fix, again