Fixing string marshalling bug