Fix correct packing