diff --git a/lib/src/main/java/org/kiwix/libkiwix/Server.java b/lib/src/main/java/org/kiwix/libkiwix/Server.java
index 58a13f1..b8b5a78 100644
--- a/lib/src/main/java/org/kiwix/libkiwix/Server.java
+++ b/lib/src/main/java/org/kiwix/libkiwix/Server.java
@@ -45,6 +45,10 @@ public class Server
     setNativeServer(library);
   }
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
   private native void setNativeServer(Library library);
   private native void dispose();
   private long nativeHandle;
diff --git a/lib/src/main/java/org/kiwix/libzim/Archive.java b/lib/src/main/java/org/kiwix/libzim/Archive.java
index 86d4129..735cc79 100644
--- a/lib/src/main/java/org/kiwix/libzim/Archive.java
+++ b/lib/src/main/java/org/kiwix/libzim/Archive.java
@@ -104,6 +104,9 @@ public class Archive
   private native void setNativeArchiveByFD(FileDescriptor fd);
   private native void setNativeArchiveEmbedded(FileDescriptor fd, long offset, long size);
 
+  @Override
+  protected void finalize() { dispose(); }
+
 
 ///--------- The wrapper thing
   // To delete our native wrapper
diff --git a/lib/src/main/java/org/kiwix/libzim/Blob.java b/lib/src/main/java/org/kiwix/libzim/Blob.java
index fc8390a..93852f2 100644
--- a/lib/src/main/java/org/kiwix/libzim/Blob.java
+++ b/lib/src/main/java/org/kiwix/libzim/Blob.java
@@ -26,9 +26,10 @@ public class Blob
   public native String getData();
   public native long size();
 
-  protected void finalize() {
-    dispose();
-  }
+
+  @Override
+  protected void finalize() { dispose(); }
+
 
 ///--------- The wrapper thing
   // To delete our native wrapper
diff --git a/lib/src/main/java/org/kiwix/libzim/Entry.java b/lib/src/main/java/org/kiwix/libzim/Entry.java
index 67b47f6..052a9df 100644
--- a/lib/src/main/java/org/kiwix/libzim/Entry.java
+++ b/lib/src/main/java/org/kiwix/libzim/Entry.java
@@ -31,9 +31,8 @@ public class Entry
   public native Item getRedirect();
   public native Entry getRedirectEntry();
 
-  protected void finalize() {
-    dispose();
-  }
+  @Override
+  protected void finalize() { dispose(); }
 
 ///--------- The wrapper thing
   // To delete our native wrapper
diff --git a/lib/src/main/java/org/kiwix/libzim/EntryIterator.java b/lib/src/main/java/org/kiwix/libzim/EntryIterator.java
index 56aa6e3..b072de1 100644
--- a/lib/src/main/java/org/kiwix/libzim/EntryIterator.java
+++ b/lib/src/main/java/org/kiwix/libzim/EntryIterator.java
@@ -29,6 +29,10 @@ public class EntryIterator implements Iterator<Entry>
   public native boolean hasNext();
   public native Entry next();
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();
diff --git a/lib/src/main/java/org/kiwix/libzim/Item.java b/lib/src/main/java/org/kiwix/libzim/Item.java
index fa75778..58e89b3 100644
--- a/lib/src/main/java/org/kiwix/libzim/Item.java
+++ b/lib/src/main/java/org/kiwix/libzim/Item.java
@@ -30,9 +30,8 @@ public class Item
   public native Blob getData();
   public native long getSize();
 
-  protected void finalize() {
-    dispose();
-  }
+  @Override
+  protected void finalize() { dispose(); }
 
 ///--------- The wrapper thing
   // To delete our native wrapper
diff --git a/lib/src/main/java/org/kiwix/libzim/Query.java b/lib/src/main/java/org/kiwix/libzim/Query.java
index 1a71408..75599b5 100644
--- a/lib/src/main/java/org/kiwix/libzim/Query.java
+++ b/lib/src/main/java/org/kiwix/libzim/Query.java
@@ -28,6 +28,10 @@ public class Query
   public native Query setQuery(String query);
   public native Query setGeorange(float latitude, float longitute, float distance);
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();
diff --git a/lib/src/main/java/org/kiwix/libzim/Search.java b/lib/src/main/java/org/kiwix/libzim/Search.java
index 8901344..d078886 100644
--- a/lib/src/main/java/org/kiwix/libzim/Search.java
+++ b/lib/src/main/java/org/kiwix/libzim/Search.java
@@ -26,6 +26,10 @@ public class Search
   public native SearchIterator getResults(int start, int maxResults);
   public native long getEstimatedMatches();
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();
diff --git a/lib/src/main/java/org/kiwix/libzim/SearchIterator.java b/lib/src/main/java/org/kiwix/libzim/SearchIterator.java
index 318039e..0a73912 100644
--- a/lib/src/main/java/org/kiwix/libzim/SearchIterator.java
+++ b/lib/src/main/java/org/kiwix/libzim/SearchIterator.java
@@ -36,6 +36,10 @@ public class SearchIterator implements Iterator<Entry>
   public native boolean hasNext();
   public native Entry next();
 
+
+  @Override
+  protected void finalize() { dispose(); }
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();
diff --git a/lib/src/main/java/org/kiwix/libzim/Searcher.java b/lib/src/main/java/org/kiwix/libzim/Searcher.java
index 13dc73e..cd3c4d6 100644
--- a/lib/src/main/java/org/kiwix/libzim/Searcher.java
+++ b/lib/src/main/java/org/kiwix/libzim/Searcher.java
@@ -51,6 +51,10 @@ public class Searcher
   private native void setNativeSearcher(Archive archive);
   private native void setNativeSearcherMulti(Archive[] archives);
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();
diff --git a/lib/src/main/java/org/kiwix/libzim/SuggestionItem.java b/lib/src/main/java/org/kiwix/libzim/SuggestionItem.java
index eef51a7..4021cd4 100644
--- a/lib/src/main/java/org/kiwix/libzim/SuggestionItem.java
+++ b/lib/src/main/java/org/kiwix/libzim/SuggestionItem.java
@@ -26,9 +26,8 @@ public class SuggestionItem
   public native String getSnippet();
   public native boolean hasSnippet();
 
-  protected void finalize() {
-    dispose();
-  }
+  @Override
+  protected void finalize() { dispose(); }
 
 ///--------- The wrapper thing
   // To delete our native wrapper
diff --git a/lib/src/main/java/org/kiwix/libzim/SuggestionIterator.java b/lib/src/main/java/org/kiwix/libzim/SuggestionIterator.java
index 553974b..20d0298 100644
--- a/lib/src/main/java/org/kiwix/libzim/SuggestionIterator.java
+++ b/lib/src/main/java/org/kiwix/libzim/SuggestionIterator.java
@@ -27,6 +27,10 @@ public class SuggestionIterator implements Iterator<SuggestionItem>
   public native boolean hasNext();
   public native SuggestionItem next();
 
+  @Override
+  protected void finalize() { dispose(); }
+
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();
diff --git a/lib/src/main/java/org/kiwix/libzim/SuggestionSearch.java b/lib/src/main/java/org/kiwix/libzim/SuggestionSearch.java
index 427f425..5d2976b 100644
--- a/lib/src/main/java/org/kiwix/libzim/SuggestionSearch.java
+++ b/lib/src/main/java/org/kiwix/libzim/SuggestionSearch.java
@@ -26,6 +26,10 @@ public class SuggestionSearch
   public native SuggestionIterator getResults(int start, int maxResults);
   public native long getEstimatedMatches();
 
+
+  @Override
+  protected void finalize() { dispose(); }
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();
diff --git a/lib/src/main/java/org/kiwix/libzim/SuggestionSearcher.java b/lib/src/main/java/org/kiwix/libzim/SuggestionSearcher.java
index c455022..c45961e 100644
--- a/lib/src/main/java/org/kiwix/libzim/SuggestionSearcher.java
+++ b/lib/src/main/java/org/kiwix/libzim/SuggestionSearcher.java
@@ -40,6 +40,10 @@ public class SuggestionSearcher
 
   private native void setNativeSearcher(Archive archive);
 
+
+  @Override
+  protected void finalize() { dispose(); }
+
 ///--------- The wrapper thing
   // To delete our native wrapper
   public native void dispose();