diff --git a/core/ormlinkset.class.inc.php b/core/ormlinkset.class.inc.php
index cd373405a..e58ff4360 100644
--- a/core/ormlinkset.class.inc.php
+++ b/core/ormlinkset.class.inc.php
@@ -836,6 +836,9 @@ class ormLinkSet implements iDBObjectSetIterator, Iterator, SeekableIterator
 			}
 
 			$oLinkSearch->AddCondition_PointingTo($oRemoteClassSearch, $sExtKeyToRemote);
+			if ($sTargetClass != $this->sClass) {
+				$oLinkSearch->RenameAlias($sTargetClass, self::REMOTE_ALIAS);
+			}
 			$oLinkSearch->SetSelectedClasses([self::LINK_ALIAS, self::REMOTE_ALIAS]);
 		}
 		$oLinkSet = new DBObjectSet($oLinkSearch);