Fix bug in Unmarshaling.