diff --git a/src/data/layers/management.tsx b/src/data/layers/management.tsx
index 0526f00..ba72c0c 100644
--- a/src/data/layers/management.tsx
+++ b/src/data/layers/management.tsx
@@ -104,12 +104,12 @@ const layer = createLayer(id, () => {
     }));
     const globalXPModifier = createSequentialModifier(() => [
         createMultiplicativeModifier(() => ({
-            multiplier: () => classroomEffect.value,
+            multiplier: classroomEffect,
             description: "Classroom Effect",
-            enabled: () => classroomUpgrade.bought.value
+            enabled: classroomUpgrade.bought
         }))
     ]);
-    const globalXPModifierComputed = globalXPModifier.apply(1);
+    const globalXPModifierComputed = computed(() => globalXPModifier.apply(1));
 
     // ------------------------------------------------------------------------------- Training core function