diff --git a/changelog.md b/changelog.md
index 7902181f..ecfed6b0 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,7 +9,8 @@
 - Bug Fix: Fixed Dedicated Servers on Fabric having issues loading data from disk (Caused dupe TARDIS and loss of Upgrades etc)
 - Bug Fix: Fixed Diagonal Windows Support
 - Bug fix: Fixed duplication happening on logging out mid-flight (and other occasions)
-
+- Bug fix: Fixed issue where End Dragon fight would not be checked correctly
+- 
 #### Textures and Models
 - Altered: Factory Console Emission Texture 
 - Altered: Factory Console (Mint) Emission Texture 
diff --git a/common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java b/common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java
index 0f326809..1f9509b5 100644
--- a/common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java
+++ b/common/src/main/java/whocraft/tardis_refined/common/tardis/control/flight/DimensionalControl.java
@@ -82,7 +82,7 @@ private boolean changeDim(TardisLevelOperator operator, ConsoleTheme theme, Cont
             // We want to filter out the end if the end hasn't been completed whilst the player is in flight. We can keep it pre-flight because we do some fancy sounds to tell the player
             // it's not an option.
             if (nextDimension.dimension() == Level.END && pilotManager.isInFlight()) {
-                if (!TardisHelper.hasTheEndBeenCompleted(pilotManager.getTargetLocation().getLevel())) {
+                if (!TardisHelper.hasTheEndBeenCompleted(nextDimension)) {
                     nextIndex += forward ? 1 : -1;
                 }
             }
diff --git a/fabric/build.gradle b/fabric/build.gradle
index c1dbf55a..d81b1ad1 100644
--- a/fabric/build.gradle
+++ b/fabric/build.gradle
@@ -83,9 +83,10 @@ dependencies {
     include "dev.onyxstudios.cardinal-components-api:cardinal-components-world:${rootProject.cardinal_version}"
     include "dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${rootProject.cardinal_version}"
 
-    modCompileOnly "com.terraformersmc:modmenu:${rootProject.mod_menu_version}"
-    modCompileOnly "curse.maven:jei-238222:${rootProject.jei_fabric_version}"
+    modImplementation "com.terraformersmc:modmenu:${rootProject.mod_menu_version}"
+    modImplementation "curse.maven:jei-238222:${rootProject.jei_fabric_version}"
     modImplementation "curse.maven:huge-structure-blocks-474114:4803539"
+    modImplementation "curse.maven:configured-457570:5180902"
 
     // Trinkets
     modCompileOnly ("dev.emi:trinkets:${rootProject.trinkets_version}") {