Fix unpack/pack eval bug