diff --git a/ems-core/src/main/java/it/integry/ems_model/base/EntityBase.java b/ems-core/src/main/java/it/integry/ems_model/base/EntityBase.java
index 58bbc6d679..2617d65a8d 100644
--- a/ems-core/src/main/java/it/integry/ems_model/base/EntityBase.java
+++ b/ems-core/src/main/java/it/integry/ems_model/base/EntityBase.java
@@ -1361,11 +1361,11 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
     public void insertEntity() throws Exception {
         java.sql.Connection con = connection.getConnection();
-        if (!(con instanceof SQLServerConnection)) {
+        if (!con.isWrapperFor(SQLServerConnection.class)) {
             throw new Exception("Impossibile processare una entity su una connessione diversa da SQL Server");
         }
 
-        SQLServerConnection sqlServerConnection = (SQLServerConnection) con;
+        SQLServerConnection sqlServerConnection = con.unwrap(SQLServerConnection.class);
 
         if (nativeSql != null) {
             SQLServerPreparedStatement pstm = (SQLServerPreparedStatement) sqlServerConnection.prepareStatement(nativeSql);
@@ -1489,7 +1489,7 @@ public abstract class EntityBase implements Serializable, Cloneable, EntityInter
 
     public void updateEntity() throws Exception {
         java.sql.Connection con = connection.getConnection();
-        if (!(con.isWrapperFor(SQLServerConnection.class))) {
+        if (!con.isWrapperFor(SQLServerConnection.class)) {
             throw new Exception("Impossibile processare una entity su una connessione diversa da SQL Server");
         }