fix structs