Fixed DiseaseRegistry system - again