fixed marshalling bug