Patch runtime to fix string issue
Marshalling