diff --git a/RSDKv3/Drawing.cpp b/RSDKv3/Drawing.cpp
index ceffc9cd..d42cbb70 100644
--- a/RSDKv3/Drawing.cpp
+++ b/RSDKv3/Drawing.cpp
@@ -1944,7 +1944,7 @@ void DrawStageGFX()
     DrawObjectList(5);
 #if !RETRO_USE_ORIGINAL_CODE
     // Hacky fix for Tails Object not working properly on non-Origins bytecode
-    if (!Engine.usingBytecode || GetGlobalVariableByName("NOTIFY_1P_VS_SELECT") != 0)
+    if (forceUseScripts || GetGlobalVariableByName("NOTIFY_1P_VS_SELECT") != 0)
 #endif
         DrawObjectList(7); // Extra Origins draw list (who knows why it comes before 6)
     DrawObjectList(6);
diff --git a/RSDKv3/Scene.cpp b/RSDKv3/Scene.cpp
index 1b59551b..34b6abee 100644
--- a/RSDKv3/Scene.cpp
+++ b/RSDKv3/Scene.cpp
@@ -304,7 +304,7 @@ void ProcessStage(void)
             DrawObjectList(5);
 #if !RETRO_USE_ORIGINAL_CODE
             // Hacky fix for Tails Object not working properly on non-Origins bytecode
-            if (!Engine.usingBytecode || GetGlobalVariableByName("NOTIFY_1P_VS_SELECT") != 0)
+            if (forceUseScripts || GetGlobalVariableByName("NOTIFY_1P_VS_SELECT") != 0)
 #endif
                 DrawObjectList(7); // Extra Origins draw list (who knows why it comes before 6)
             DrawObjectList(6);