Fixed unmarshalling