diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java
index dfdc44fe..5e2f74e5 100644
--- a/src/main/java/fr/xephi/authme/AuthMe.java
+++ b/src/main/java/fr/xephi/authme/AuthMe.java
@@ -75,7 +75,7 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.6.0-Fork";
     private static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "39";
+    private static String pluginBuildNumber = "40";
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;
diff --git a/src/main/java/fr/xephi/authme/listener/AdvancedShulkerFixListener.java b/src/main/java/fr/xephi/authme/listener/AdvancedShulkerFixListener.java
index 04cad6db..d68662e1 100644
--- a/src/main/java/fr/xephi/authme/listener/AdvancedShulkerFixListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AdvancedShulkerFixListener.java
@@ -11,17 +11,16 @@ import org.bukkit.event.block.BlockDispenseEvent;
 //This fix is only for Minecraft 1.13-
 public class AdvancedShulkerFixListener implements Listener {
 
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
     public void onDispenserActivate(BlockDispenseEvent event) {
         Block block = event.getBlock();
 
         if (block.getRelative(BlockFace.DOWN).getType().equals(Material.AIR) && block.getY() == 0) {
             event.setCancelled(true);
+            return;
         }
-        if (block.getRelative(BlockFace.UP).getType().equals(Material.AIR)) {
-            if (block.getY() == block.getWorld().getMaxHeight() - 1) {
-                event.setCancelled(true);
-            }
+        if (block.getRelative(BlockFace.UP).getType().equals(Material.AIR) && block.getY() == block.getWorld().getMaxHeight() - 1) {
+            event.setCancelled(true);
         }
     }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 3a3f649f..3774e109 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -3,7 +3,7 @@ authors: [${pluginDescription.authors}]
 website: http://github.com/HaHaWTH/AuthMeReReloaded/
 description: A fork of AuthMeReloaded that contains bug fixes
 main: ${pluginDescription.main}
-version: 5.6.0-FORK-b39
+version: 5.6.0-FORK-b40
 api-version: 1.13
 softdepend:
     - Vault