diff --git a/src/java/foundation/pEp/jniadapter/AbstractEngine.java b/src/java/foundation/pEp/jniadapter/AbstractEngine.java
index 1b18fca..b7aba8b 100644
--- a/src/java/foundation/pEp/jniadapter/AbstractEngine.java
+++ b/src/java/foundation/pEp/jniadapter/AbstractEngine.java
@@ -8,7 +8,7 @@ import foundation.pEp.jniadapter.interfaces.*;
 import foundation.pEp.jniadapter.exceptions.*;
 
 
-abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEngineInterface, AutoCloseable {
+abstract class AbstractEngine extends UniquelyIdentifiable implements AbstractEngineInterface {
     static {
         System.loadLibrary("pEpJNI");
     }
diff --git a/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java b/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
index cdfca76..63fb399 100644
--- a/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
+++ b/src/java/foundation/pEp/jniadapter/interfaces/AbstractEngineInterface.java
@@ -3,7 +3,7 @@ package foundation.pEp.jniadapter.interfaces;
 import foundation.pEp.jniadapter.Message;
 import foundation.pEp.jniadapter.Sync;
 
-public interface AbstractEngineInterface {
+public interface AbstractEngineInterface extends AutoCloseable {
     public String getVersion();
 
     public String getProtocolVersion();