Fixed marshalling bug.