diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php
index 60438e200..904cbe8f1 100644
--- a/install_minimal/include/AirtimeInstall.php
+++ b/install_minimal/include/AirtimeInstall.php
@@ -68,6 +68,14 @@ class AirtimeInstall
             if (PEAR::isError($version)) {
                 return null;
             }
+
+            $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
+            $result = $CC_DBC->GetOne($sql);
+            if (!PEAR::isError($result)) {
+                $version = "1.7.0";
+                //echo "Airtime Version: ".$version." ".PHP_EOL;
+            }
+
             // no version string detected
             if($version == ''){
                 $version = false;
diff --git a/install_minimal/include/airtime-install.php b/install_minimal/include/airtime-install.php
index faaad8d0e..ff4f8d731 100644
--- a/install_minimal/include/airtime-install.php
+++ b/install_minimal/include/airtime-install.php
@@ -72,7 +72,7 @@ if (isset($version) && ($version != false) && ($version < AIRTIME_VERSION) && !i
 }
 
 if($version === false){
-    echo "A version of Airtime older than 1.8.0 detected, please upgrade to 1.8.0 first.\n";
+    echo "A version of Airtime older than 1.7.0 detected, please upgrade to 1.7.0 first.\n";
     echo "You will then be able to upgrade to 1.9.0 using this installer.\n";
     exit(3);
 }
diff --git a/install_minimal/include/airtime-upgrade.php b/install_minimal/include/airtime-upgrade.php
index 856a1a57f..32c68ad33 100644
--- a/install_minimal/include/airtime-upgrade.php
+++ b/install_minimal/include/airtime-upgrade.php
@@ -12,6 +12,7 @@ set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . ge
 require_once('DB.php');
 require_once(__DIR__.'/../../airtime_mvc/application/configs/constants.php');
 require_once(dirname(__FILE__).'/AirtimeIni.php');
+require_once(dirname(__FILE__).'/AirtimeInstall.php');
 
 if(exec("whoami") != "root"){
     echo "Must be root user.\n";
@@ -43,6 +44,7 @@ if (PEAR::isError($CC_DBC)) {
     $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC);
 }
 
+/*
 $sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version'";
 $version = $CC_DBC->GetOne($sql);
 
@@ -52,7 +54,7 @@ if (PEAR::isError($version)) {
 
 if (!$version){
 
-    $sql = "SELECT * FROM ".$p_name;
+    $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
     $result = $CC_DBC->GetOne($sql);
     if (!PEAR::isError($result)) {
         $version = "1.7.0";
@@ -63,6 +65,9 @@ if (!$version){
         echo "Airtime Version: ".$version." ".PHP_EOL;
     }
 }
+*/
+
+$version = AirtimeInstall::GetVersionInstalled();
 
 echo "******************************** Update Begin *********************************".PHP_EOL;
 
diff --git a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
index c43b66047..d3f20807f 100644
--- a/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.0/airtime-upgrade.php
@@ -162,9 +162,9 @@ function LoadConfig($CC_CONFIG) {
     $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
     $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
+    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
     // main directory for storing binary media files
-    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
+    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
 
     // Database config
     $CC_CONFIG['dsn']['username'] = $values['database']['dbuser'];
diff --git a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
index 478262dde..2b4764db2 100644
--- a/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.1/airtime-upgrade.php
@@ -88,9 +88,9 @@ function LoadConfig($CC_CONFIG) {
     $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
     $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
+    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
     // main directory for storing binary media files
-    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
+    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
 
     //$CC_CONFIG['baseUrl'] = $values['general']['base_url'];
     //$CC_CONFIG['basePort'] = $values['general']['base_port'];
diff --git a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
index 33107d79f..0f88c22c3 100644
--- a/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
+++ b/install_minimal/upgrades/airtime-1.8.2/airtime-upgrade.php
@@ -88,9 +88,9 @@ function LoadConfig($CC_CONFIG) {
     $CC_CONFIG['phpDir'] = $values['general']['airtime_dir'];
     $CC_CONFIG['rabbitmq'] = $values['rabbitmq'];
 
-    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'],
+    $CC_CONFIG['baseFilesDir'] = $values['general']['base_files_dir'];
     // main directory for storing binary media files
-    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor",
+    $CC_CONFIG['storageDir'] = $values['general']['base_files_dir']."/stor";
 
     $CC_CONFIG['baseUrl'] = $values['general']['base_url'];
     $CC_CONFIG['basePort'] = $values['general']['base_port'];