diff --git a/C4.puml b/C4.puml
index 140e4fc..11b8b23 100644
--- a/C4.puml
+++ b/C4.puml
@@ -276,7 +276,7 @@ skinparam package {
 ' clear the restore property
 !function $clearRestore($elementType, $property)
   !$var = "$" + $elementType + "Restore" + $property
-  %set_variable_value($var, $value)
+  %set_variable_value($var, "")
   !return ""
 !endfunction
 
@@ -747,7 +747,6 @@ $addRelTagToLegend($tagStereo, $textColor, $lineColor, $lineStyle, $legendText,
 !$techn=$restoreEmpty($elementName, "techn", $techn, %true())
 !$legendText=$restoreEmpty($elementName, "legendText", $legendText, %true())
 !$legendSprite=$restoreEmpty($elementName, "legendSprite", $legendSprite, %true())
-
 $defineSkinparams($elementName, $bgColor, $fontColor, $borderColor, $shadowing, $shape)
   !if ($sprite != "")
 %set_variable_value("$" + $elementName + "ElementTagSprite", $sprite)
diff --git a/C4_Context.puml b/C4_Context.puml
index aca1034..144b56b 100644
--- a/C4_Context.puml
+++ b/C4_Context.puml
@@ -176,14 +176,21 @@ endlegend
 !endprocedure
 
 !global $defaultPersonSprite = "person"
-  !$dummy = $restoreEmpty("person", "sprite", $defaultPersonSprite, %true())
+!$dummy = $restoreEmpty("person", "sprite", $defaultPersonSprite, %true())
+UpdateElementStyle("person")
 !global $portraitPerson = "false"
 
-!procedure HIDE_PERSON_SPRITE()
-  !$defaultPersonSprite = ""
+!procedure $clearPersonRestore()
   !$dummy = $clearRestore("person", "sprite")
+  !$dummy = $clearRestore("person", "legendSprite")
+  %set_variable_value("$" + "person" + "ElementTagSprite", "")
   UpdateElementStyle("person")
+!endprocedure
+
+!procedure HIDE_PERSON_SPRITE()
+  !$defaultPersonSprite = ""
   !$portraitPerson = "false"
+  $clearPersonRestore()
 !endprocedure
 
 !unquoted procedure SHOW_PERSON_SPRITE($sprite="")
@@ -199,16 +206,14 @@ endlegend
 
 !unquoted procedure SHOW_PERSON_PORTRAIT()
   !$defaultPersonSprite = ""
-  !$dummy = $clearRestore("person", "sprite")
-  UpdateElementStyle("person")
   !$portraitPerson = "portrait"
+  $clearPersonRestore()
 !endprocedure
 
 !unquoted procedure SHOW_PERSON_OUTLINE()
   !$defaultPersonSprite = ""
-  !$dummy = $clearRestore("person", "sprite")
-  UpdateElementStyle("person")
   !$portraitPerson = "outline"
+  $clearPersonRestore()
 !endprocedure
 
 ' Elements