diff --git a/include/functions.php b/include/functions.php
index 61642a6..9d0fe02 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -298,25 +298,28 @@ function getActualMode($metaLastHeard, $mmdvmconfigs) {
 	if (startsWith($mode, "DMR")) {
 		$mode = "DMR";
 	}
-	
-	$now =  new DateTime();
-	$hangtime = getConfigItem("General", "ModeHang", $mmdvmconfigs);
-	
-	if ($hangtime != "") {
-		$timestamp->add(new DateInterval('PT' . $hangtime . 'S'));
-	} else {
-		$source = $listElem[6];
-		if ($source === "Network") {
-			$hangtime = getConfigItem("General", "NetModeHang", $mmdvmconfigs);
-		} else {
-			$hangtime = getConfigItem("General", "RFModeHang", $mmdvmconfigs);
-		}
-		$timestamp->add(new DateInterval('PT' . $hangtime . 'S'));
-	}
-	if ($now->format('U') > $timestamp->format('U')) {
-		return "idle";
-	} else {
+	if ($listElem[6] ==="") {
 		return $mode;
+	} else {
+		$now =  new DateTime();
+		$hangtime = getConfigItem("General", "ModeHang", $mmdvmconfigs);
+		
+		if ($hangtime != "") {
+			$timestamp->add(new DateInterval('PT' . $hangtime . 'S'));
+		} else {
+			$source = $listElem[6];
+			if ($source === "Network") {
+				$hangtime = getConfigItem("General", "NetModeHang", $mmdvmconfigs);
+			} else {
+				$hangtime = getConfigItem("General", "RFModeHang", $mmdvmconfigs);
+			}
+			$timestamp->add(new DateInterval('PT' . $hangtime . 'S'));
+		}
+		if ($now->format('U') > $timestamp->format('U')) {
+			return "idle";
+		} else {
+			return $mode;
+		}
 	}
 }
 
diff --git a/version.php b/version.php
index 72a2919..921f22f 100644
--- a/version.php
+++ b/version.php
@@ -1,3 +1,3 @@
 <?php
-define("VERSION", "20160721-1");
+define("VERSION", "20160810-1");
 ?>
\ No newline at end of file