diff --git a/src/controllers/rigplatform.ts b/src/controllers/rigplatform.ts
index 34c864f..163d08c 100644
--- a/src/controllers/rigplatform.ts
+++ b/src/controllers/rigplatform.ts
@@ -35,14 +35,15 @@ export class Rigplatform {
     public turnSnap: number = 0;
     public rigMesh: Mesh;
 
-    constructor(scene: Scene, xr: WebXRDefaultExperience,
+    constructor(
+        xr: WebXRDefaultExperience,
                 diagramManager: DiagramManager
     ) {
-        this.scene = scene;
+        this.scene = diagramManager.scene;
         this.diagramManager = diagramManager;
         this.controllers = diagramManager.controllers;
         this.xr = xr;
-        this.rigMesh = buildRig(scene, xr);
+        this.rigMesh = buildRig(this.scene, xr);
 
         this.fixRotation();
         this.initializeControllers();
diff --git a/src/util/functions/groundMeshObserver.ts b/src/util/functions/groundMeshObserver.ts
index 9ea7059..c05dd02 100644
--- a/src/util/functions/groundMeshObserver.ts
+++ b/src/util/functions/groundMeshObserver.ts
@@ -63,7 +63,7 @@ export async function groundMeshObserver(ground: AbstractMesh,
         }
     });
 
-    const rig = new Rigplatform(ground.getScene(), xr, diagramManager);
+    const rig = new Rigplatform(xr, diagramManager);
     const currentConfig = diagramManager.config.current;
     rig.flyMode = currentConfig.flyMode;
     rig.turnSnap = currentConfig.turnSnap;