Composite packets handling fixed