diff --git a/ws/Archetypes/mi-maven-archetype-jpa-hibernate/src/main/resources/archetype-resources/src/main/java/CreateEntity.java b/ws/Archetypes/mi-maven-archetype-jpa-hibernate/src/main/resources/archetype-resources/src/main/java/CreateEntity.java
index bbc2941efb11a344ad221e6db86bd21781fdf5d8..53ddeeeb5dc31603b21cdd66da2219c2d20666df 100644
--- a/ws/Archetypes/mi-maven-archetype-jpa-hibernate/src/main/resources/archetype-resources/src/main/java/CreateEntity.java
+++ b/ws/Archetypes/mi-maven-archetype-jpa-hibernate/src/main/resources/archetype-resources/src/main/java/CreateEntity.java
@@ -36,6 +36,8 @@ public class CreateEntity {
        log.info("Committed transaction");
 
        em.close();
-       factory.close();
+     
+       // See http://stackoverflow.com/questions/21645516/program-using-hibernate-does-not-terminate
+       factory.close(); 
     }
-}
\ No newline at end of file
+}