fixed marshalling issue