Fixing cohort loading