fixing string marshalling