Fix saveStruct