diff --git a/src/main/java/net/axay/kspigot/chat/KColors.java b/src/main/java/net/axay/kspigot/chat/KColors.java
index cbcd6e92..cf68203b 100644
--- a/src/main/java/net/axay/kspigot/chat/KColors.java
+++ b/src/main/java/net/axay/kspigot/chat/KColors.java
@@ -3,7 +3,6 @@ package net.axay.kspigot.chat;
 import net.kyori.adventure.text.format.TextColor;
 import net.kyori.adventure.text.format.TextDecoration;
 
-import java.lang.reflect.Field;
 import java.util.*;
 import java.util.stream.Collectors;
 
diff --git a/src/main/kotlin/net/axay/kspigot/gui/GUI.kt b/src/main/kotlin/net/axay/kspigot/gui/GUI.kt
index 3caa57bf..655bc928 100644
--- a/src/main/kotlin/net/axay/kspigot/gui/GUI.kt
+++ b/src/main/kotlin/net/axay/kspigot/gui/GUI.kt
@@ -99,7 +99,9 @@ class GUIIndividual<T : ForInventory>(
     init {
         if (resetOnClose || data.onClose != null) {
             listen<InventoryCloseEvent> {
-                if (data.onClose != null && playerInstances[it.player]?.bukkitInventory == it.inventory) {
+                if (playerInstances[it.player]?.bukkitInventory != it.inventory) return@listen
+
+                if (data.onClose != null) {
                     data.onClose.invoke(GUICloseEvent(it, playerInstances[it.player]!!, it.player as Player))
                 }