CaseStudy: some bug fixed