fixed marshalling