Justitia fixes