Fix bug in ClassMarshaller