justice for #96835 (#96835)