diff --git a/Projects/Superalgos/UI/Spaces/Charting-Space/ChartingSpace.js b/Projects/Superalgos/UI/Spaces/Charting-Space/ChartingSpace.js
index f2a7cc380..503e8a91b 100644
--- a/Projects/Superalgos/UI/Spaces/Charting-Space/ChartingSpace.js
+++ b/Projects/Superalgos/UI/Spaces/Charting-Space/ChartingSpace.js
@@ -252,7 +252,7 @@ function newSuperalgosChartingSpace() {
                 returnPoint.y = COCKPIT_SPACE_POSITION
             }
         } else {
-            if (point.y > COCKPIT_SPACE_POSITION + COCKPIT_SPACE_HEIGHT / 2) {
+            if (point.y > COCKPIT_SPACE_POSITION ) {
                 returnPoint.y = COCKPIT_SPACE_POSITION + COCKPIT_SPACE_HEIGHT / 2
             }
         }
@@ -273,7 +273,7 @@ function newSuperalgosChartingSpace() {
             return false
         }
 
-        if (point.y > COCKPIT_SPACE_POSITION + COCKPIT_SPACE_HEIGHT / 2) {
+        if (point.y > COCKPIT_SPACE_POSITION) {
             return false
         }
 
diff --git a/Projects/Superalgos/UI/Spaces/Charting-Space/Plotting/Plotter.js b/Projects/Superalgos/UI/Spaces/Charting-Space/Plotting/Plotter.js
index 563f473b5..db3293e13 100644
--- a/Projects/Superalgos/UI/Spaces/Charting-Space/Plotting/Plotter.js
+++ b/Projects/Superalgos/UI/Spaces/Charting-Space/Plotting/Plotter.js
@@ -812,14 +812,16 @@ function newPlotter() {
                             y: dataPointObject.y
                         }
                         dataPoint = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(dataPoint)
-                        dataPoint = thisObject.fitFunction(dataPoint)
 
-                        imagePosition.x = dataPoint.x
-                        imagePosition.y = dataPoint.y
+                        imagePosition.x = dataPoint.x - imageSize / 2 + offsetX
+                        imagePosition.y = dataPoint.y - imageSize / 2 - offsetY
+
+                        imagePosition = thisObject.fitFunction(imagePosition, true)
+
                         let imageToDraw = UI.projects.superalgos.spaces.designSpace.getIconByProjectAndName('Superalgos', imageName)
                         if (imageToDraw !== undefined) {
                             if (imageToDraw.canDrawIcon === true) {
-                                browserCanvasContext.drawImage(imageToDraw, imagePosition.x - imageSize / 2 + offsetX, imagePosition.y - imageSize / 2 - offsetY, imageSize, imageSize)
+                                browserCanvasContext.drawImage(imageToDraw, imagePosition.x, imagePosition.y, imageSize, imageSize)
                             }
                         } else {
                             console.log('Can not plot image named ' + imageName + ' of product ' + productDefinition.name + ' because it does not exist.')
@@ -858,14 +860,15 @@ function newPlotter() {
                             y: dataPointObject.y
                         }
                         dataPoint = UI.projects.superalgos.spaces.chartingSpace.viewport.fitIntoVisibleArea(dataPoint)
-                        dataPoint = thisObject.fitFunction(dataPoint)
 
-                        textPosition.x = dataPoint.x
-                        textPosition.y = dataPoint.y
+                        textPosition.x = dataPoint.x + offsetX
+                        textPosition.y = dataPoint.y - offsetY
+
+                        textPosition = thisObject.fitFunction(textPosition)
 
                         browserCanvasContext.font = fontSize + 'px ' + UI_FONT.PRIMARY
                         browserCanvasContext.fillStyle = 'rgba(' + paletteColor + ', ' + opacity + ')'
-                        browserCanvasContext.fillText(value, textPosition.x + offsetX, textPosition.y - offsetY)
+                        browserCanvasContext.fillText(value, textPosition.x, textPosition.y)
                     }
                 }
             }