Fixed bug in Util class