diff --git a/DATabase/Core/Generate.cs b/DATabase/Core/Generate.cs
index 8bf4daab..3495d9a0 100644
--- a/DATabase/Core/Generate.cs
+++ b/DATabase/Core/Generate.cs
@@ -250,8 +250,8 @@ namespace DATabase
 			List<RomData> roms = new List<RomData>();
 
 			// Check if we have listed sources or systems
-			bool sysmerged = (_systems != "" && _systems.Split(',').Length > 1);
-			bool srcmerged = (_sources != "" && _sources.Split(',').Length > 1);
+			bool sysmerged = (_systems == "" || _systems.Split(',').Length > 1);
+			bool srcmerged = (_sources == "" || _sources.Split(',').Length > 1);
 			bool merged = sysmerged || srcmerged;
 
 			string query = @"
diff --git a/DATabase/Program.cs b/DATabase/Program.cs
index a1bce1e7..2b84ded1 100644
--- a/DATabase/Program.cs
+++ b/DATabase/Program.cs
@@ -28,7 +28,7 @@ namespace DATabase
 
 			// Determine which switches are enabled (with values if necessary)
 			bool help = false, import = false, generate = false, convert = false,
-				listsys = false, listsrc = false, norename = false, old = false; ;
+				listsys = false, listsrc = false, norename = false, old = false;
 			string systems = "", sources = "", input = "";
 			foreach (string arg in args)
 			{