Patches issues associated with deserializing shipments from extended data