diff --git a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme
index f9cb5764c..5ef5cd72f 100644
--- a/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
+++ b/OSBindings/Mac/Clock Signal.xcodeproj/xcshareddata/xcschemes/Clock Signal Kiosk.xcscheme	
@@ -61,8 +61,8 @@
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "--new=archimedes"
-            isEnabled = "NO">
+            argument = "--new=zxspectrum"
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "/Users/thomasharte/Downloads/Program/Program.prg"
@@ -70,11 +70,11 @@
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--rompath=/Users/thomasharte/Projects/CLK/ROMImages"
-            isEnabled = "NO">
+            isEnabled = "YES">
          </CommandLineArgument>
          <CommandLineArgument
             argument = "--help"
-            isEnabled = "YES">
+            isEnabled = "NO">
          </CommandLineArgument>
       </CommandLineArguments>
    </LaunchAction>
diff --git a/Outputs/CRT/CRT.cpp b/Outputs/CRT/CRT.cpp
index 401ba969a..0ecff3759 100644
--- a/Outputs/CRT/CRT.cpp
+++ b/Outputs/CRT/CRT.cpp
@@ -469,7 +469,7 @@ void CRT::posit(Display::Rect rect) {
 	};
 
 	// Continue with any ongoing animation.
-	if(animation_step_ < AnimationSteps) {
+	if(animation_step_ != NoFrameYet && animation_step_ < AnimationSteps) {
 		set_rect(current_rect());
 		++animation_step_;
 		if(animation_step_ == AnimationSteps) {
@@ -507,8 +507,9 @@ void CRT::posit(Display::Rect rect) {
 				return;
 			}
 		}
-	}
 
+		return;
+	}
 
 	const auto output_frame = rect_accumulator_.posit(rect);
 	dynamic_framer_.update(rect, output_frame, first_reading);