diff --git a/package.json b/package.json
index 02854a0ef1daf1f42c98c88bad10b5e402eb4ffc..382364b7636ef31c53902e014561736b16e4883b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medsurf-draw",
-  "version": "1.0.229",
+  "version": "1.0.230",
   "description": "Draw annotations on jpg/zoomify images, based on PIXI.js",
   "keywords": [
     "draw",
@@ -29,7 +29,7 @@
   "author": "Gottsponer Andrea Leonardo",
   "license": "MIT",
   "dependencies": {
-    "@ascii-dev-user/medsurf-lib": "^1.18.0-138",
+    "@ascii-dev-user/medsurf-lib": "^1.18.0-139",
     "@babel/core": "^7.8.4",
     "@pixi-essentials/cull": "^1.0.12",
     "debounce": "^1.2.1",
diff --git a/src/lib/elements/primitives/ArrowPrimitive.ts b/src/lib/elements/primitives/ArrowPrimitive.ts
index 335f08d1f96b75afcebd7f438e864f406bd427e3..f796aaaec211b44d7821cbd80ab012c4ed7b6f85 100644
--- a/src/lib/elements/primitives/ArrowPrimitive.ts
+++ b/src/lib/elements/primitives/ArrowPrimitive.ts
@@ -453,12 +453,11 @@ export class ArrowPrimitive extends BaseElementContainer<Models.ArrowPrimitive,
     //<editor-fold desc="Static functions">
     /**
      * Get instance
-     * @param model
      * @param hasWedgePoint
      * @param rotateWithLine
      * @param imageWidth
      */
-    public static getInstance(model: Models.PositionPoint, hasWedgePoint: boolean, rotateWithLine: boolean, imageWidth: number): ArrowPrimitive {
+    public static getInstance(hasWedgePoint: boolean, rotateWithLine: boolean, imageWidth: number): ArrowPrimitive {
         // Element
         // -- Arrow primitive
         return new ArrowPrimitive({
diff --git a/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts b/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
index 2cf61dcea613362bf92f5fcc892e20fb71d1e8a3..387cfb802b13f6eab4a01608c2f60d76c1fee520 100644
--- a/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
+++ b/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
@@ -421,12 +421,11 @@ export class BackgroundRectanglePrimitive extends BaseElementContainer<Models.Ba
     //<editor-fold desc="Static functions">
     /**
      * Get instance
-     * @param model
      * @param primitiveId
      * @param rotateWithLine
      * @param imageWidth
      */
-    public static getInstance(model: Models.PositionPoint, primitiveId: string, rotateWithLine: boolean, imageWidth: number): BackgroundRectanglePrimitive {
+    public static getInstance(primitiveId: string, rotateWithLine: boolean, imageWidth: number): BackgroundRectanglePrimitive {
         // Element
         // -- Background rectangle primitive
         return new BackgroundRectanglePrimitive({
diff --git a/src/lib/elements/primitives/EllipsePrimitive.ts b/src/lib/elements/primitives/EllipsePrimitive.ts
index 7106fd3b93e233415a33c3298aef1e7d3e3e1a9c..32165ceccca4af59b3201ea3d4706b32db6d3379 100644
--- a/src/lib/elements/primitives/EllipsePrimitive.ts
+++ b/src/lib/elements/primitives/EllipsePrimitive.ts
@@ -420,11 +420,10 @@ export class EllipsePrimitive extends BaseElementContainer<Models.EllipsePrimiti
     //<editor-fold desc="Static functions">
     /**
      * Get instance
-     * @param model
      * @param rotateWithLine
      * @param imageWidth
      */
-    public static getInstance(model: Models.PositionPoint, rotateWithLine: boolean, imageWidth: number): EllipsePrimitive {
+    public static getInstance(rotateWithLine: boolean, imageWidth: number): EllipsePrimitive {
         // Element
         // -- Ellipse primitive
         return new EllipsePrimitive({
diff --git a/src/lib/elements/primitives/RectanglePrimitive.ts b/src/lib/elements/primitives/RectanglePrimitive.ts
index e6a52c884512a865575b5162579da5b470d7df54..4f88e5b75255b20ae0cebb45c0b53d1bfc0dc957 100644
--- a/src/lib/elements/primitives/RectanglePrimitive.ts
+++ b/src/lib/elements/primitives/RectanglePrimitive.ts
@@ -421,11 +421,10 @@ export class RectanglePrimitive extends BaseElementContainer<Models.RectanglePri
     //<editor-fold desc="Static functions">
     /**
      * Get instance
-     * @param model
      * @param rotateWithLine
      * @param imageWidth
      */
-    public static getInstance(model: Models.PositionPoint, rotateWithLine: boolean, imageWidth: number): RectanglePrimitive {
+    public static getInstance(rotateWithLine: boolean, imageWidth: number): RectanglePrimitive {
         // Element
         // -- Rectangle primitive
         return new RectanglePrimitive({
diff --git a/src/lib/elements/primitives/TextPrimitive.ts b/src/lib/elements/primitives/TextPrimitive.ts
index dba0f3e0c9dc95e29981d8a61dbbe0d6bea2a3d1..4ed27faa60541340455e989084bd3278f85efb09 100644
--- a/src/lib/elements/primitives/TextPrimitive.ts
+++ b/src/lib/elements/primitives/TextPrimitive.ts
@@ -445,11 +445,10 @@ export class TextPrimitive extends BaseElementContainer<Models.TextPrimitive, Ba
     //<editor-fold desc="Static functions">
     /**
      * Get instance
-     * @param model
      * @param rotateWithLine
      * @param imageWidth
      */
-    public static getInstance(model: Models.PositionPoint, rotateWithLine: boolean, imageWidth: number): TextPrimitive {
+    public static getInstance(rotateWithLine: boolean, imageWidth: number): TextPrimitive {
         // Element
         // -- Text primitive
         return new TextPrimitive({
@@ -1452,7 +1451,7 @@ export class TextPrimitive extends BaseElementContainer<Models.TextPrimitive, Ba
         const parent = this.parent as MedsurfDraw.PositionPoint;
 
         // Create new background rectangle
-        const backgroundRectangle = MedsurfDraw.BackgroundRectanglePrimitive.getInstance(parent.model, this.model.id as string, this.model.rotateWithLine, imageWidth);
+        const backgroundRectangle = MedsurfDraw.BackgroundRectanglePrimitive.getInstance(this.model.id as string, this.model.rotateWithLine, imageWidth);
         parent.addChild(backgroundRectangle);
         backgroundRectangle.modeInteraction.setDefaultMode("author");
 
diff --git a/src/lib/generators/combinations/ArrowGenerator.ts b/src/lib/generators/combinations/ArrowGenerator.ts
index a83afd8fcb82175723c77e4fee93660e81876b92..eaa676a0b01df0fa7bd718320d2b183de3417710 100644
--- a/src/lib/generators/combinations/ArrowGenerator.ts
+++ b/src/lib/generators/combinations/ArrowGenerator.ts
@@ -181,7 +181,7 @@ export class ArrowGenerator extends BaseGenerator<MedsurfDraw.Image, ArrowGenera
                 stickMode: MedsurfDraw.StickMode.NOELEMENTS,
                 startElement: positionPoint,
                 rotateWithLine: false,
-                triggerImmediateEndDraw: false
+                triggerImmediateEndDraw: true
             });
             this._textPrimitiveGenerator.once("startGenerator", this.startTextPrimitiveGenerator, this);
             this._textPrimitiveGenerator.once("endGenerator", this.endTextPrimitiveGenerator, this);
diff --git a/src/lib/generators/combinations/EllipseGenerator.ts b/src/lib/generators/combinations/EllipseGenerator.ts
index d96e215098947e14d17a771defe79ab56519af95..625ddb9a2b3c98df036aedc413228a3e4eeab731 100644
--- a/src/lib/generators/combinations/EllipseGenerator.ts
+++ b/src/lib/generators/combinations/EllipseGenerator.ts
@@ -179,7 +179,7 @@ export class EllipseGenerator extends BaseGenerator<MedsurfDraw.Image, EllipseGe
                 stickMode: MedsurfDraw.StickMode.NOELEMENTS,
                 startElement: positionPoint,
                 rotateWithLine: false,
-                triggerImmediateEndDraw: false
+                triggerImmediateEndDraw: true
             });
             this._textPrimitiveGenerator.once("startGenerator", this.startTextPrimitiveGenerator, this);
             this._textPrimitiveGenerator.once("endGenerator", this.endTextPrimitiveGenerator, this);
diff --git a/src/lib/generators/combinations/RectangleGenerator.ts b/src/lib/generators/combinations/RectangleGenerator.ts
index 99be52da15eec677183e0d5bde7b817ae80fb31f..50a3e4fe4de6c52de7ea52323902c488aa7f5cb3 100644
--- a/src/lib/generators/combinations/RectangleGenerator.ts
+++ b/src/lib/generators/combinations/RectangleGenerator.ts
@@ -179,7 +179,7 @@ export class RectangleGenerator extends BaseGenerator<MedsurfDraw.Image, Rectang
                 stickMode: MedsurfDraw.StickMode.NOELEMENTS,
                 startElement: positionPoint,
                 rotateWithLine: false,
-                triggerImmediateEndDraw: false
+                triggerImmediateEndDraw: true
             });
             this._textPrimitiveGenerator.once("startGenerator", this.startTextPrimitiveGenerator, this);
             this._textPrimitiveGenerator.once("endGenerator", this.endTextPrimitiveGenerator, this);
diff --git a/src/lib/generators/primitives/ArrowPrimitiveGenerator.ts b/src/lib/generators/primitives/ArrowPrimitiveGenerator.ts
index d9acd6246de3cd5980eec341d59d5231a7741cd3..4ec0a6bb7ad0920a8f82daec38833b69203d0302 100644
--- a/src/lib/generators/primitives/ArrowPrimitiveGenerator.ts
+++ b/src/lib/generators/primitives/ArrowPrimitiveGenerator.ts
@@ -189,7 +189,7 @@ export class ArrowPrimitiveGenerator extends BaseGenerator<MedsurfDraw.Image, Ar
     public startPositionPointGenerator(): void {
         //<editor-fold desc="Elements">
         // -- Arrow primitive element
-        this._arrowPrimitiveElement = MedsurfDraw.ArrowPrimitive.getInstance(this.positionPointElement.model, this.hasWedgePoint, this.rotateWithLine, this.target.dimensions.width);
+        this._arrowPrimitiveElement = MedsurfDraw.ArrowPrimitive.getInstance(this.hasWedgePoint, this.rotateWithLine, this.target.dimensions.width);
         this.positionPointElement.addChild(this.arrowPrimitiveElement);
         this.arrowPrimitiveElement.controlDrawItem();
         this.arrowPrimitiveElement.showItem();
diff --git a/src/lib/generators/primitives/EllipsePrimitiveGenerator.ts b/src/lib/generators/primitives/EllipsePrimitiveGenerator.ts
index 9800721a6d4a917db3c06764c8426762179f0267..aafa7b1f5552509fc455bc8f96e25e1b1ae2b430 100644
--- a/src/lib/generators/primitives/EllipsePrimitiveGenerator.ts
+++ b/src/lib/generators/primitives/EllipsePrimitiveGenerator.ts
@@ -188,7 +188,7 @@ export class EllipsePrimitiveGenerator extends BaseGenerator<MedsurfDraw.Image,
     public startPositionPointGenerator(): void {
         //<editor-fold desc="Elements">
         // -- Ellipse primitive element
-        this._ellipsePrimitiveElement = MedsurfDraw.EllipsePrimitive.getInstance(this.positionPointElement.model, this.rotateWithLine, this.target.dimensions.width);
+        this._ellipsePrimitiveElement = MedsurfDraw.EllipsePrimitive.getInstance(this.rotateWithLine, this.target.dimensions.width);
         this.positionPointElement.addChild(this.ellipsePrimitiveElement);
         this.ellipsePrimitiveElement.controlDrawItem();
         this.ellipsePrimitiveElement.showItem();
diff --git a/src/lib/generators/primitives/RectanglePrimitiveGenerator.ts b/src/lib/generators/primitives/RectanglePrimitiveGenerator.ts
index 4312e654c4fdcf9d5034a776234ee9dc9c8fb1da..4ffa82b45e123860e8f6e8afc15cf0725c0a18fc 100644
--- a/src/lib/generators/primitives/RectanglePrimitiveGenerator.ts
+++ b/src/lib/generators/primitives/RectanglePrimitiveGenerator.ts
@@ -187,7 +187,7 @@ export class RectanglePrimitiveGenerator extends BaseGenerator<MedsurfDraw.Image
     public startPositionPointGenerator(): void {
         //<editor-fold desc="Elements">
         // -- Rectangle primitive element
-        this._rectanglePrimitiveElement = MedsurfDraw.RectanglePrimitive.getInstance(this.positionPointElement.model, this.rotateWithLine, this.target.dimensions.width);
+        this._rectanglePrimitiveElement = MedsurfDraw.RectanglePrimitive.getInstance(this.rotateWithLine, this.target.dimensions.width);
         this.positionPointElement.addChild(this.rectanglePrimitiveElement);
         this.rectanglePrimitiveElement.controlDrawItem();
         this.rectanglePrimitiveElement.showItem();
diff --git a/src/lib/generators/primitives/TextPrimitiveGenerator.ts b/src/lib/generators/primitives/TextPrimitiveGenerator.ts
index d1fcfb940f9c89752051fdb651644aa6e6c7fa9c..c48ecac68cdf4f380d28df9445908b3690da2075 100644
--- a/src/lib/generators/primitives/TextPrimitiveGenerator.ts
+++ b/src/lib/generators/primitives/TextPrimitiveGenerator.ts
@@ -187,7 +187,7 @@ export class TextPrimitiveGenerator extends BaseGenerator<MedsurfDraw.Image, Tex
     public startPositionPointGenerator(): void {
         //<editor-fold desc="Elements">
         // -- Text primitive element
-        this._textPrimitiveElement = MedsurfDraw.TextPrimitive.getInstance(this.positionPointElement.model, this.rotateWithLine, this.target.dimensions.width);
+        this._textPrimitiveElement = MedsurfDraw.TextPrimitive.getInstance(this.rotateWithLine, this.target.dimensions.width);
         this.positionPointElement.addChild(this.textPrimitiveElement);
         this.textPrimitiveElement.controlDrawItem();
         this.textPrimitiveElement.showItem();