Fix the utility class calculations