Fix unmarshaling