diff --git a/StaticAnalyser/Acorn/AcornAnalyser.cpp b/StaticAnalyser/Acorn/AcornAnalyser.cpp
index db261ff6c..0803c39a2 100644
--- a/StaticAnalyser/Acorn/AcornAnalyser.cpp
+++ b/StaticAnalyser/Acorn/AcornAnalyser.cpp
@@ -112,6 +112,6 @@ void StaticAnalyser::Acorn::AddTargets(
 
 	// TODO: disks
 
-//	if(target.tapes.size() || target.cartridges.size())
+	if(target.tapes.size() || target.cartridges.size())
 		destination.push_back(target);
 }
diff --git a/StaticAnalyser/Commodore/CommodoreAnalyser.cpp b/StaticAnalyser/Commodore/CommodoreAnalyser.cpp
index 90d30574e..7fce5cf3c 100644
--- a/StaticAnalyser/Commodore/CommodoreAnalyser.cpp
+++ b/StaticAnalyser/Commodore/CommodoreAnalyser.cpp
@@ -32,5 +32,16 @@ void StaticAnalyser::Commodore::AddTargets(
 		tape->reset();
 		std::list<File> files = GetFiles(tape);
 		tape->reset();
+
+		// continue if there are any files
+		if(files.size())
+		{
+			// TODO: decide between ,1 (don't relocate; for machine code) and ,0 (relocate; for BASIC)
+			// TODO: decide memory model (based on extents and sizes)
+			// TODO: decide machine (disassemble?)
+		}
 	}
+
+	if(target.tapes.size() || target.cartridges.size() || target.disks.size())
+		destination.push_back(target);
 }
\ No newline at end of file