diff --git a/src/lib/Supra/Controller/Pages/Filter/ParsedHtmlFilter.php b/src/lib/Supra/Controller/Pages/Filter/ParsedHtmlFilter.php
index <HASH>..<HASH> 100644
--- a/src/lib/Supra/Controller/Pages/Filter/ParsedHtmlFilter.php
+++ b/src/lib/Supra/Controller/Pages/Filter/ParsedHtmlFilter.php
@@ -42,8 +42,6 @@ class ParsedHtmlFilter implements FilterInterface
 	 */
 	private function parseSupraLinkStart(Entity\ReferencedElement\LinkReferencedElement $link)
 	{
-		ObjectRepository::setCallerParent($link, $this);
-
 		$attributes = array(
 				'target' => $link->getTarget(),
 				'title' => $link->getTitle(),
@@ -194,6 +192,8 @@ class ParsedHtmlFilter implements FilterInterface
 				else {
 
 					$link = $metadataItem->getReferencedElement();
+					// Overwriting in case of duplicate markup tag usage
+					ObjectRepository::setCallerParent($link, $this, true);
 					$result[] = $this->parseSupraLinkStart($link);
 				}
 			}
Bug #<I> fixed, ObjectRepository::setCallerParent was called twice, guess because of duplicate supra link markup ID inside the editable HTML.

git-svn-id: <URL>