Fixed the Utility class