diff --git a/src/iso.c b/src/iso.c
index d7246159..cd1cb2c1 100644
--- a/src/iso.c
+++ b/src/iso.c
@@ -319,6 +319,10 @@ static void fix_config(const char* psz_fullpath, const char* psz_path, const cha
 				// somewhere in their kernel options and use 'persistent' as keyword.
 				uprintf("  Added 'persistent' kernel option");
 				modified = TRUE;
+				// Also remove Ubuntu's "maybe-ubiquity" to avoid splash screen (GRUB only)
+				if ((props->is_grub_cfg) && replace_in_token_data(src, "linux",
+					"maybe-ubiquity", "", TRUE))
+					uprintf("  Removed 'maybe-ubiquity' kernel option");
 			} else if (replace_in_token_data(src, props->is_grub_cfg ? "linux" : "append",
 				"boot=live", "boot=live persistence", TRUE) != NULL) {
 				// Debian & derivatives are assumed to use 'boot=live' in
diff --git a/src/parser.c b/src/parser.c
index 3b43e3ca..47b2e4d8 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -1100,7 +1100,7 @@ char* replace_in_token_data(const char* filename, const char* token, const char*
 
 	if ((filename == NULL) || (token == NULL) || (src == NULL) || (rep == NULL))
 		return NULL;
-	if ((filename[0] == 0) || (token[0] == 0) || (src[0] == 0) || (rep[0] == 0))
+	if ((filename[0] == 0) || (token[0] == 0) || (src[0] == 0))
 		return NULL;
 	if (strcmp(src, rep) == 0)	// No need for processing is source is same as replacement
 		return NULL;
diff --git a/src/rufus.rc b/src/rufus.rc
index 2b5618e6..1b880404 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 232, 326
 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.11.1672"
+CAPTION "Rufus 3.11.1673"
 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
 BEGIN
     LTEXT           "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -395,8 +395,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,11,1672,0
- PRODUCTVERSION 3,11,1672,0
+ FILEVERSION 3,11,1673,0
+ PRODUCTVERSION 3,11,1673,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -414,13 +414,13 @@ BEGIN
             VALUE "Comments", "https://rufus.ie"
             VALUE "CompanyName", "Akeo Consulting"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "3.11.1672"
+            VALUE "FileVersion", "3.11.1673"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
             VALUE "OriginalFilename", "rufus-3.11.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "3.11.1672"
+            VALUE "ProductVersion", "3.11.1673"
         END
     END
     BLOCK "VarFileInfo"