diff --git a/projects/common/util/unit-utils.ts b/projects/common/util/unit-utils.ts
index 4c0230104c90efd331362c680532b89d15a41832..b242c9c2eaafcfdb9f12dd8ac401d1957052a81e 100644
--- a/projects/common/util/unit-utils.ts
+++ b/projects/common/util/unit-utils.ts
@@ -1,10 +1,10 @@
-import { UIElement } from 'common/models/elements/element';
+import { UIElement, UIElementType } from 'common/models/elements/element';
 
 export abstract class UnitUtils {
-  static findUIElements(value: any | unknown[], type?: string): UIElement[] {
+  static findUIElements(value: any | unknown[], type?: UIElementType): UIElement[] {
     const elements: UIElement[] = [];
     if (value && typeof value === 'object') {
-      if (type ? value.type === type : value.type) {
+      if (type ? value.type === type : value instanceof UIElement) {
         elements.push(value);
       }
       if (Array.isArray(value)) {