Fixed problem with marshalling inner classes.