Date pack/unpack fix