#17298 Hot fix class Result