diff --git a/DS-Core.sketchplugin.zip b/DS-Core.sketchplugin.zip
index 66b4ed4..92caa1a 100644
Binary files a/DS-Core.sketchplugin.zip and b/DS-Core.sketchplugin.zip differ
diff --git a/DS-Core.sketchplugin/Contents/Sketch/create-typography-scale.js b/DS-Core.sketchplugin/Contents/Sketch/create-typography-scale.js
index 2482f40..5c38c90 100644
--- a/DS-Core.sketchplugin/Contents/Sketch/create-typography-scale.js
+++ b/DS-Core.sketchplugin/Contents/Sketch/create-typography-scale.js
@@ -33,9 +33,14 @@ var onRun = function(context) {
         var originalSelection = selection;
         var currentPage = selection.getParentPage();
         var currentArtboard = selection.getParentArtboard();
+        console.log(currentArtboard);
 
         var selectionX = selection.frame.x;
         var selectionY = selection.frame.y;
+        if (currentArtboard !== undefined) {
+            selectionX = currentArtboard.frame.x;
+            selectionY = currentArtboard.frame.y;
+        }
 
         var newArtboardCreated = false;
         if (currentArtboard === undefined) {
diff --git a/DS-Core.sketchplugin/Contents/Sketch/manifest.json b/DS-Core.sketchplugin/Contents/Sketch/manifest.json
index 7261b49..9aa0e5f 100644
--- a/DS-Core.sketchplugin/Contents/Sketch/manifest.json
+++ b/DS-Core.sketchplugin/Contents/Sketch/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "DS Core",
     "description": "Batch create Typography, Color Scales and Components really fast.",
-    "version": "1.5.4",
+    "version": "1.5.5",
     "author": "Francesco Bertocci & Matteo Gratton",
     "authorEmail": "fbmore@gmail.com",
     "appcast": "https://raw.githubusercontent.com/fbmore/DS-Core-Sketch-Plugin/main/appcast.xml",
diff --git a/DS-Core.sketchplugin/Contents/appcast.xml b/DS-Core.sketchplugin/Contents/appcast.xml
index b862578..f90fb88 100644
--- a/DS-Core.sketchplugin/Contents/appcast.xml
+++ b/DS-Core.sketchplugin/Contents/appcast.xml
@@ -5,7 +5,7 @@
     <description>Batch create Typography, Color Scales and Components really fast.</description>
     <language>en</language>
     <item>
-      <title>Version 1.5.4</title>
+      <title>Version 1.5.5</title>
       <description>
         <![CDATA[
         <ul>
@@ -13,7 +13,7 @@
         </ul>
         ]]>
       </description>
-      <enclosure url="https://github.com/fbmore/DS-Core-Sketch-Plugin/raw/main/DS-Core.sketchplugin.zip" sparkle:version="1.5.4" type="application/octet-stream"/>
+      <enclosure url="https://github.com/fbmore/DS-Core-Sketch-Plugin/raw/main/DS-Core.sketchplugin.zip" sparkle:version="1.5.5" type="application/octet-stream"/>
     </item>
   </channel>
 </rss>