diff --git a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java
index ca2125c0..5b864f25 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/implementation/ApiContextManager.java
@@ -110,7 +110,7 @@ public class ApiContextManager implements me.lucko.luckperms.api.context.Context
     @Override
     public void unregisterCalculator(@NonNull ContextCalculator<?> calculator) {
         Objects.requireNonNull(calculator, "calculator");
-
+        this.handle.unregisterCalculator(calculator);
     }
 
     @Override
diff --git a/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java b/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java
index c288cdf6..a75bdb3a 100644
--- a/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java
+++ b/common/src/main/java/me/lucko/luckperms/common/context/ContextManager.java
@@ -190,7 +190,7 @@ public abstract class ContextManager<T> {
     protected Contexts calculate(T subject) {
         MutableContextSet accumulator = MutableContextSet.create();
 
-        for (ContextCalculator<? super T> calculator : ContextManager.this.calculators) {
+        for (ContextCalculator<? super T> calculator : this.calculators) {
             try {
                 MutableContextSet ret = calculator.giveApplicableContext(subject, accumulator);
                 if (ret == null) {