fix restruct