diff --git a/addon/lib/rmupdate.tcl b/addon/lib/rmupdate.tcl
index 1f8224a..519c25c 100644
--- a/addon/lib/rmupdate.tcl
+++ b/addon/lib/rmupdate.tcl
@@ -154,7 +154,7 @@ proc ::rmupdate::update_cmdline {cmdline root} {
 	set data [read $fd]
 	close $fd
 	
-	regsub -all "root=\[a-zA-Z0-9=/-\]+\s" $data "root=${root} " data
+	regsub -all "root=\[a-zA-Z0-9\=/\-\]+ " $data "root=${root} " data
 	
 	set fd [open $cmdline w]
 	puts $fd $data
diff --git a/addon/www/index.html b/addon/www/index.html
index e348a81..c2b59a1 100644
--- a/addon/www/index.html
+++ b/addon/www/index.html
@@ -139,11 +139,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 				},
 				function(xhr, ajaxOptions, thrownError) {
 					$('[data-install-version="' + installation_running + '"]').removeClass('loading');
-					installation_running = "";
 					//$('#modal-log').modal('hide');
 					if (installation_running) {
 						//get_firmware_info();
 						default_error_callback(xhr, ajaxOptions, thrownError);
+						installation_running = "";
 					}
 				}
 			);
diff --git a/rmupdate.tar.gz b/rmupdate.tar.gz
index 95ef779..c89fb18 100644
Binary files a/rmupdate.tar.gz and b/rmupdate.tar.gz differ