diff --git a/build.gradle b/build.gradle
index 1764c3c5..060b85ab 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ buildscript {
 }
 
 apply plugin: 'forge'
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'curseforge'
 
 import org.ajoberstar.grgit.Grgit
@@ -109,6 +109,26 @@ artifacts {
     archives apiJar
 }
 
+publishing {
+    tasks.publish.dependsOn 'build'
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+
+            artifact sourcesJar
+            artifact apiJar
+            artifact deobfJar
+        }
+    }
+
+    repositories {
+        String prop = dev ? "chisel_mavendir" : "chisel_mavendir_dev"
+        if (project.hasProperty(prop)) {
+            maven { url project.getProperty(prop) }
+        }
+    }
+}
+
 String getChangelogText() {
     def changelogFile = new File('changelog')
     String str = ''
diff --git a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java b/src/main/java/com/cricketcraft/chisel/carving/GroupList.java
index a2bb7159..f4f9560d 100644
--- a/src/main/java/com/cricketcraft/chisel/carving/GroupList.java
+++ b/src/main/java/com/cricketcraft/chisel/carving/GroupList.java
@@ -227,10 +227,8 @@ public class GroupList implements Set<ICarvingGroup> {
 		}
 		List<VariationWrapper> toRemove = Lists.newArrayList();
 		for (VariationWrapper v : lookup.keySet()) {
-			if ((g == null || lookup.get(v) == g) && v.v.getBlock() == block && v.v.getBlockMeta() == metadata) {
-				if (g != null) {
-					g.removeVariation(v.v);
-				}
+			if ((g == null || lookup.get(v).getName().equals(g.getName())) && v.equals(new VariationWrapper(new VariationKey(block, metadata)))) {
+				lookup.get(v).removeVariation(v.v);
 				toRemove.add(v);
 			}
 		}