fix for new structure