diff --git a/CUE4Parse b/CUE4Parse
index ae298a23..996c1c81 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit ae298a23de24f0b05e101a0fc8f0192667f0ed4b
+Subproject commit 996c1c813133c1178b52f5a05667a85019415b0e
diff --git a/FModel/Views/Snooper/Renderer.cs b/FModel/Views/Snooper/Renderer.cs
index 8ff7f0c3..7f2276bc 100644
--- a/FModel/Views/Snooper/Renderer.cs
+++ b/FModel/Views/Snooper/Renderer.cs
@@ -20,7 +20,6 @@ using FModel.Settings;
 using FModel.Views.Snooper.Buffers;
 using FModel.Views.Snooper.Lights;
 using FModel.Views.Snooper.Models;
-using FModel.Views.Snooper.Models.Animations;
 using FModel.Views.Snooper.Shading;
 
 namespace FModel.Views.Snooper;
@@ -32,6 +31,7 @@ public class Renderer : IDisposable
     private Shader _shader;
     private Shader _outline;
     private Shader _light;
+    private bool _saveCameraMode;
 
     public bool ShowSkybox;
     public bool ShowGrid;
@@ -59,6 +59,8 @@ public class Renderer : IDisposable
     public void Load(CancellationToken cancellationToken, UObject export)
     {
         ShowLights = false;
+        _saveCameraMode = export is not UWorld;
+        CameraOp.Mode = _saveCameraMode ? UserSettings.Default.CameraMode : Camera.WorldMode.FlyCam;
         switch (export)
         {
             case UStaticMesh st:
@@ -72,7 +74,6 @@ public class Renderer : IDisposable
                 break;
             case UWorld wd:
                 LoadWorld(cancellationToken, wd, Transform.Identity);
-                CameraOp.Mode = Camera.WorldMode.FlyCam;
                 break;
         }
     }
@@ -216,7 +217,7 @@ public class Renderer : IDisposable
             var position = worldPartition.GetOrDefault("Position", FVector.ZeroVector) * Constants.SCALE_DOWN_RATIO;
             var box = worldPartition.GetOrDefault("ContentBounds", new FBox(FVector.ZeroVector, FVector.OneVector));
             box *= MathF.Pow(Constants.SCALE_DOWN_RATIO, 2);
-            CameraOp.Teleport(position, box, true);
+            CameraOp.Teleport(new Vector3(position.X, position.Z, position.Y), box, true);
         }
 
         var length = persistentLevel.Actors.Length;
@@ -392,7 +393,7 @@ public class Renderer : IDisposable
 
     public void Save()
     {
-        UserSettings.Default.CameraMode = CameraOp.Mode;
+        if (_saveCameraMode) UserSettings.Default.CameraMode = CameraOp.Mode;
         UserSettings.Default.ShowSkybox = ShowSkybox;
         UserSettings.Default.ShowGrid = ShowGrid;
     }