diff --git a/Analyser/Static/ZXSpectrum/Target.hpp b/Analyser/Static/ZXSpectrum/Target.hpp
index 4996d21fa..76eada20e 100644
--- a/Analyser/Static/ZXSpectrum/Target.hpp
+++ b/Analyser/Static/ZXSpectrum/Target.hpp
@@ -27,7 +27,7 @@ struct Target: public ::Analyser::Static::Target, public Reflection::StructImpl<
 		Plus3,
 	);
 
-	Model model = Model::Plus2a;
+	Model model = Model::Plus2;
 	bool should_hold_enter = false;
 
 	Target(): Analyser::Static::Target(Machine::ZXSpectrum) {
diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
index 30686b1f5..c7ce231ca 100644
--- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
+++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp
@@ -717,9 +717,9 @@ template<Model model> class ConcreteMachine:
 
 		void set_memory(int bank, uint8_t source) {
 			if constexpr (model >= Model::Plus2a) {
-				is_contended_[bank] = (source >= 4 && source < 8);
+				is_contended_[bank] = source >= 4 && source < 8;
 			} else {
-				is_contended_[bank] = source & 1;
+				is_contended_[bank] = source < 0x80 && source & 1;
 			}
 			pages_[bank] = source;