diff --git a/addon.gradle b/addon.gradle
new file mode 100644
index 00000000..cc0f5d57
--- /dev/null
+++ b/addon.gradle
@@ -0,0 +1,3 @@
+compileJava {
+    options.encoding = "UTF-8"
+}
diff --git a/src/main/java/codechicken/nei/LayoutManager.java b/src/main/java/codechicken/nei/LayoutManager.java
index 249bc8a1..b3a4c6c2 100644
--- a/src/main/java/codechicken/nei/LayoutManager.java
+++ b/src/main/java/codechicken/nei/LayoutManager.java
@@ -77,11 +77,11 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     /**
      * Sorted bottom first
      */
-    private static TreeSet<Widget> drawWidgets;
+    private static final TreeSet<Widget> drawWidgets = new TreeSet<>(new WidgetZOrder(false));
     /**
      * Sorted top first
      */
-    private static TreeSet<Widget> controlWidgets;
+    private static final TreeSet<Widget> controlWidgets = new TreeSet<>(new WidgetZOrder(true));
 
     public static ItemPanel itemPanel;
     public static BookmarkPanel bookmarkPanel;
@@ -669,8 +669,8 @@ public class LayoutManager implements IContainerInputHandler, IContainerTooltipH
     }
 
     public static void updateWidgetVisiblities(GuiContainer gui, VisiblityData visiblity) {
-        drawWidgets = new TreeSet<>(new WidgetZOrder(false));
-        controlWidgets = new TreeSet<>(new WidgetZOrder(true));
+        drawWidgets.clear();
+        controlWidgets.clear();
 
         if (!visiblity.showNEI)
             return;