Data marshaler subclass fix