Fixed case_7