diff --git a/share/upgrades/7.9.12-8.0.0/removeAdminBar.pl b/share/upgrades/7.9.12-8.0.0/removeAdminBar.pl
index 09a64dba8..498159196 100644
--- a/share/upgrades/7.9.12-8.0.0/removeAdminBar.pl
+++ b/share/upgrades/7.9.12-8.0.0/removeAdminBar.pl
@@ -7,7 +7,7 @@ use WebGUI::Asset::Template;
 
 my $removeAdminBar = sub {
     my $macro = shift;
-    if ($macro->{macroPackage} eq 'WebGUI::Macro::AdminBar') {
+    if ($macro->{macro} eq 'AdminBar' || $macro->{macroPackage} eq 'WebGUI::Macro::AdminBar' ) {
         return '';
     }
     else {