Fix previous bug also in the organization weighted analysis