see line 20

If the change in line 20 is correct, all the utility function should be
changed