Fixed a terrible ordering bug breaking risk/classical/case_3