Fix for organizer entities