diff --git a/package-lock.json b/package-lock.json
index 13901bd..14f42f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26357,7 +26357,7 @@
     },
     "packages/ngx-fast-lib": {
       "name": "@push-based/ngx-fast-svg",
-      "version": "0.5.1",
+      "version": "18.0.0",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/ant/icons.ts b/packages/ngx-fast-icon-demo/src/app/comparison/ant/icons.ts
index 8bb7327..9db2a3d 100644
--- a/packages/ngx-fast-icon-demo/src/app/comparison/ant/icons.ts
+++ b/packages/ngx-fast-icon-demo/src/app/comparison/ant/icons.ts
@@ -8,6 +8,14 @@ export const account: IconDefinition = {
   theme: 'fill',
 };
 
+export const us: IconDefinition = {
+  icon: `<svg id="us" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path
+  d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2a7.2 7.2 0 01-6-3.22c.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08a7.2 7.2 0 01-6 3.22z"></path></svg>
+`,
+  name: 'us',
+  theme: 'fill',
+};
+
 export const back: IconDefinition = {
   icon: `<svg id="back" viewBox="0 0 448 512" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path
   d="M257.5 445.1l-22.2 22.2c-9.4 9.4-24.6 9.4-33.9 0L7 273c-9.4-9.4-9.4-24.6 0-33.9L201.4 44.7c9.4-9.4 24.6-9.4 33.9 0l22.2 22.2c9.5 9.5 9.3 25-.4 34.3L136.6 216H424c13.3 0 24 10.7 24 24v32c0 13.3-10.7 24-24 24H136.6l120.5 114.8c9.8 9.3 10 24.8.4 34.3z"></path></svg>
@@ -2505,6 +2513,7 @@ export const workshops = {
 
 export const AllIcons = [
   account,
+  us,
   back,
   consulting,
   custom_workshops_1,
diff --git a/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome/font-awesome.component.ts b/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome/font-awesome.component.ts
index 0c7f249..acfbb1d 100644
--- a/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome/font-awesome.component.ts
+++ b/packages/ngx-fast-icon-demo/src/app/comparison/font-awesome/font-awesome.component.ts
@@ -22,6 +22,7 @@ export class FontAwesomeComponent {
       faCircleUser,
       faCircleUser,
       faCircleUser,
+      faCircleUser,
     ]);
   }
 }
diff --git a/packages/ngx-fast-icon-demo/src/app/icon-data.ts b/packages/ngx-fast-icon-demo/src/app/icon-data.ts
index f24abcc..ba19410 100644
--- a/packages/ngx-fast-icon-demo/src/app/icon-data.ts
+++ b/packages/ngx-fast-icon-demo/src/app/icon-data.ts
@@ -1,5 +1,6 @@
 export const SUPPORTED_ICONS = [
   'account',
+  'us',
   'back',
   'genre',
   'imdb',
diff --git a/packages/ngx-fast-icon-demo/src/assets/svg-icons/us.svg b/packages/ngx-fast-icon-demo/src/assets/svg-icons/us.svg
new file mode 100644
index 0000000..1422885
--- /dev/null
+++ b/packages/ngx-fast-icon-demo/src/assets/svg-icons/us.svg
@@ -0,0 +1,2 @@
+<svg id="us" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg"><path
+  d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2a7.2 7.2 0 01-6-3.22c.03-1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08a7.2 7.2 0 01-6 3.22z"></path></svg>
diff --git a/packages/ngx-fast-lib/src/lib/fast-svg.component.ts b/packages/ngx-fast-lib/src/lib/fast-svg.component.ts
index 21ee1bc..96e8a8a 100644
--- a/packages/ngx-fast-lib/src/lib/fast-svg.component.ts
+++ b/packages/ngx-fast-lib/src/lib/fast-svg.component.ts
@@ -182,7 +182,7 @@ export class FastSvgComponent implements AfterViewInit, OnDestroy {
         // If the img is present
         // and the name in included in the href (svg is fully loaded, not only the suspense svg)
         // Remove the element from the DOM as it is no longer needed
-        if (cache.name.includes(this.name)) {
+        if (cache.name === `#${this.name}`) {
           img.removeEventListener('load', this.loadedListener);
           // removeEventListener.bind(img, 'load', this.loadedListener);
           img.remove();