Fix: Improved Util.php