Fixed to use Utility class