Fix pack and unpack between 2.6 and 2.5