Fix new structure