Fixed unmarshalling error