try to fix new structure