diff --git a/app/main/controller/api/structure.php b/app/main/controller/api/structure.php
index c1defe1a..db4a4900 100644
--- a/app/main/controller/api/structure.php
+++ b/app/main/controller/api/structure.php
@@ -34,7 +34,7 @@ class Structure extends Controller\AccessController {
                  * @var $structure Model\StructureModel
                  */
                 $structure = Model\BasicModel::getNew('StructureModel');
-                foreach ($structuresData as $structureData){
+                foreach($structuresData as $structureData){
                     // reset on loop start because of potential "continue"
                     $structure->reset();
 
@@ -46,7 +46,7 @@ class Structure extends Controller\AccessController {
                         }
                     }elseif( !isset($structureData['id']) ){
                         // from clipboard -> search by structure by name
-                        $structure->getByName($activeCharacter->getCorporation(), (string)$structureData['name']);
+                        $structure->getByName($activeCharacter->getCorporation(), (string)$structureData['name'], (int)$structureData['systemId']);
                     }
 
                     $newStructure = $structure->dry();
diff --git a/app/main/model/structuremodel.php b/app/main/model/structuremodel.php
index cd12d97c..700eb1cc 100644
--- a/app/main/model/structuremodel.php
+++ b/app/main/model/structuremodel.php
@@ -225,11 +225,12 @@ class StructureModel extends BasicModel {
         return $structuresData;
     }
 
-    public function getByName(CorporationModel $corporation, string $name) {
+    public function getByName(CorporationModel $corporation, string $name, int $systemId) {
         if( !$corporation->dry() && $name){
             $this->has('structureCorporations', ['corporationId = :corporationId', ':corporationId' => $corporation->_id]);
-            $this->load(['name = :name AND active = :active',
+            $this->load(['name = :name AND systemId = :systemId AND active = :active',
                 ':name' => $name,
+                ':systemId' => $systemId,
                 ':active' => 1
             ]);
         }
diff --git a/composer.json b/composer.json
index bc59b090..56ba0a52 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,6 @@
     "monolog/monolog": "1.*",
     "websoftwares/monolog-zmq-handler": "0.2.*",
     "swiftmailer/swiftmailer": "^6.0",
-    "exodus4d/pathfinder_esi": "dev-master#v1.2.4"
+    "exodus4d/pathfinder_esi": "dev-master#v1.2.5"
   }
 }