diff --git a/src/whois.gtld.fastdomain.php b/src/whois.gtld.fastdomain.php
index 65a6d1d..14d3693 100644
--- a/src/whois.gtld.fastdomain.php
+++ b/src/whois.gtld.fastdomain.php
@@ -65,7 +65,7 @@ class fastdomain_handler
 			{
 			reset($r['domain']['nserver']);
 			$endnserver = false;
-			while (list($key, $val) = each($r['domain']['nserver']))
+			foreach ($r['domain']['nserver'] as $key => $val)
 				{
 				if ($val == '=-=-=-=')
 					unset($r['domain']['nserver'][$key]);
diff --git a/src/whois.parser.php b/src/whois.parser.php
index eedbc61..4908ff8 100644
--- a/src/whois.parser.php
+++ b/src/whois.parser.php
@@ -355,7 +355,7 @@ foreach ($rawdata as $key => $val)
 		$disok = false;
 		reset($items);
 
-		while (list($match, $field)=each($items))
+		foreach ($items as $match => $field)
 			{
 			$pos = strpos($val,$match);
 
@@ -624,7 +624,7 @@ if ($extra_items)
 	$items = $extra_items;
 	}
 
-while (list($key,$val)=each($array))
+foreach ($array as $key => $val)
 	{
 	$ok=true;