diff --git a/Assets/Scripts/Games/Rockers/Rockers.cs b/Assets/Scripts/Games/Rockers/Rockers.cs
index 52105318..0f7dd441 100644
--- a/Assets/Scripts/Games/Rockers/Rockers.cs
+++ b/Assets/Scripts/Games/Rockers/Rockers.cs
@@ -818,15 +818,18 @@ namespace HeavenStudio.Games
                 if (moveCamera) instance.MoveCamera(beat - 1);
                 instance.StartInterval(beat, length, beat, autoPassTurn, movePass);
             }
-            if (moveCamera) queuedCameraEvents.Add(beat - 1);
-            queuedIntervals.Add(new QueuedInterval()
+            else
             {
-                beat = beat,
-                length = length,
-                autoPassTurn = autoPassTurn,
-                moveCamera = moveCamera,
-                moveCameraPass = movePass
-            });
+                queuedIntervals.Add(new QueuedInterval()
+                {
+                    beat = beat,
+                    length = length,
+                    autoPassTurn = autoPassTurn,
+                    moveCamera = moveCamera,
+                    moveCameraPass = movePass
+                });
+            }
+            if (moveCamera) queuedCameraEvents.Add(beat - 1);
         }
 
         private void MoveCamera(double beat)
@@ -899,7 +902,7 @@ namespace HeavenStudio.Games
                     }
                 }),
             });
-            if (autoPassTurn) PassTurn(beat + length, moveCamera, beat, length);
+            if (autoPassTurn && beat + (length * 2) > gameSwitchBeat) PassTurn(beat + length, moveCamera, beat, length);
         }
 
         public void Riff(double beat, float length, int[] pitches, bool gleeClubJJ, int sampleJJ, int sampleTonesJJ, bool noRespond)
diff --git a/Assets/Scripts/Games/SeeSaw/SeeSaw.cs b/Assets/Scripts/Games/SeeSaw/SeeSaw.cs
index 016bf1be..386af987 100644
--- a/Assets/Scripts/Games/SeeSaw/SeeSaw.cs
+++ b/Assets/Scripts/Games/SeeSaw/SeeSaw.cs
@@ -276,7 +276,7 @@ namespace HeavenStudio.Games
                 double goodBeat = tempEvents[0].beat + tempEvents[0].length;
                 for (int i = 1; i < tempEvents.Count; i++)
                 {
-                    if (tempEvents[i].beat != goodBeat)
+                    if (tempEvents[i].beat < goodBeat)
                     {
                         tempEvents2.Add(tempEvents[i]);
                     }