diff --git a/tools/geoip_generator.pl b/tools/geoip_generator.pl
index 4b9c02d..2ca3e3f 100644
--- a/tools/geoip_generator.pl
+++ b/tools/geoip_generator.pl
@@ -8,7 +8,6 @@
 # $Revision: 1.1 $ - $Author: eldy $ - $Date: 2010/04/17 17:57:58 $
 
 use strict; no strict "refs";
-use Switch;
 
 #------------------------------------------------------------------------------
 # Defines
@@ -447,24 +446,28 @@ while ($start <= $end){
 	# clean start and end quotes
 	if ($f =~ m/^"/) {$f = substr($f, 1);}
 	
-	# build the fields by switching on the dbtype
-	switch (lc($DBType)){
-		case "geoip" 		{$f .= $Values[1]; }
-		case "geoipfree" 	{$f .= $Values[1]; }
-		case "geoipcity"	{
-			$f .= $Values[1].",".$Values[2].",\"".$Values[3]."\",\"";
-			$f .= $Values[4]."\",".$Values[5].",".$Values[6].",\"";
-			$f .= $Values[7]."\",\"".$Values[8]."\""; 
-		} 
-		case "geoipcitylite"	{
-			$f .= $Values[1].",".$Values[2].",\"".$Values[3]."\",\"";
-			$f .= $Values[4]."\",".$Values[5].",".$Values[6].",\"";
-			$f .= $Values[7]."\",\"".$Values[8]."\""; 
-		} 
-		case "geoipregion"	{$f .= "\"".$Values[2]."\""; }
-		case "geoiporg"		{$f .= "\"".$Values[9]."\""; }
-		case "geoipasn"		{$f .= "\"".$Values[10]." ".$Values[9]."\""}		
+	# build the fields based on the dbtype
+	my $lc_DBType = lc($DBType);
+	if ($lc_DBType eq "geoip") {$f .= $Values[1]; }
+	if ($lc_DBType eq "geoipfree") {$f .= $Values[1]; }
+	if ($lc_DBType eq "geoipcity") {
+		$f .= $Values[1].",".$Values[2].",\"".$Values[3]."\",\"";
+		$f .= $Values[4]."\",".$Values[5].",".$Values[6].",\"";
+		$f .= $Values[7]."\",\"".$Values[8]."\"";
 	}
+	if ($lc_DBType eq "geoipcitylite") {
+		$f .= $Values[1].",".$Values[2].",\"".$Values[3]."\",\"";
+		$f .= $Values[4]."\",".$Values[5].",".$Values[6].",\"";
+		$f .= $Values[7]."\",\"".$Values[8]."\"";
+	}
+	if ($lc_DBType eq "geoipcitylite") {
+		$f .= $Values[1].",".$Values[2].",\"".$Values[3]."\",\"";
+		$f .= $Values[4]."\",".$Values[5].",".$Values[6].",\"";
+		$f .= $Values[7]."\",\"".$Values[8]."\"";
+	}
+	if ($lc_DBType eq "geoipregion") {$f .= "\"".$Values[2]."\""; }
+	if ($lc_DBType eq "geoiporg") {$f .= "\"".$Values[9]."\""; }
+	if ($lc_DBType eq "geoipasn") {$f .= "\"".$Values[10]." ".$Values[9]."\""}		
 	
 	$temp{num_to_addr($start)} = $f;
 	debug("Generating: ".num_to_addr($start)."$f",2);