Packaging fix