Bug fix for Struct, string was not terminated properly