Fix for new structure