Fixed struct-packing