diff --git a/functions.inc.php b/functions.inc.php
index b9fce472..764667cd 100644
--- a/functions.inc.php
+++ b/functions.inc.php
@@ -41,7 +41,7 @@ function fields($table) {
 				"length" => $match[2],
 				"unsigned" => ltrim($match[3] . $match[4]),
 				"default" => $row["Default"],
-				"null" => ($row["Null"] != "NO"),
+				"null" => ($row["Null"] == "YES"),
 				"extra" => $row["Extra"],
 				"collation" => $row["Collation"],
 				"privileges" => explode(",", $row["Privileges"]),
diff --git a/table.inc.php b/table.inc.php
index 4f96938b..7cfac1a1 100644
--- a/table.inc.php
+++ b/table.inc.php
@@ -7,7 +7,7 @@ if (!$result) {
 } else {
 	echo "<table border='1' cellspacing='0' cellpadding='2'>\n";
 	while ($row = mysql_fetch_assoc($result)) {
-		echo "<tr><th>" . htmlspecialchars($row["Field"]) . "</th><td>$row[Type]" . ($row["Null"] == "NO" ? "" : " <i>NULL</i>") . "</td></tr>\n";
+		echo "<tr><th>" . htmlspecialchars($row["Field"]) . "</th><td>$row[Type]" . ($row["Null"] == "YES" ? " <i>NULL</i>" : "") . "</td></tr>\n";
 	}
 	echo "</table>\n";
 	mysql_free_result($result);