diff --git a/LandLord-core/src/main/java/biz/princeps/lib/crossversion/CrossVersion.java b/LandLord-core/src/main/java/biz/princeps/lib/crossversion/CrossVersion.java
index d28a19fa..92083d5c 100644
--- a/LandLord-core/src/main/java/biz/princeps/lib/crossversion/CrossVersion.java
+++ b/LandLord-core/src/main/java/biz/princeps/lib/crossversion/CrossVersion.java
@@ -15,7 +15,7 @@ public CrossVersion() {
     }
 
     public static String getVersion() {
-        return Bukkit.getServer().getClass().getPackage().getName().replace(".", ",").split(",")[3];
+        return Bukkit.getBukkitVersion().split("-")[0];
     }
 
     public ItemStack addNBTTag(ItemStack stack, String key, Object value) {
diff --git a/LandLord-core/src/main/java/biz/princeps/lib/crossversion/MaterialProxy.java b/LandLord-core/src/main/java/biz/princeps/lib/crossversion/MaterialProxy.java
index 985189d0..a434081e 100644
--- a/LandLord-core/src/main/java/biz/princeps/lib/crossversion/MaterialProxy.java
+++ b/LandLord-core/src/main/java/biz/princeps/lib/crossversion/MaterialProxy.java
@@ -21,8 +21,8 @@ public enum MaterialProxy {
 
     public ItemStack crossVersion() {
         String version = CrossVersion.getVersion();
-        if ("v1_12_R1".equals(version)) {
-            return getLegacy();
+        if (version.startsWith("1.12")) {
+            getLegacy();
         }
         return getLatest();
     }