Fix struct