one more fix to pack/unpack