Struct fix