diff --git a/src/headers/parsing/ParseComponents.hpp b/src/headers/parsing/ParseComponents.hpp
index ef81f7d..f8ceedb 100644
--- a/src/headers/parsing/ParseComponents.hpp
+++ b/src/headers/parsing/ParseComponents.hpp
@@ -52,10 +52,11 @@ protected:
 public:
     IS(StandardComponents::NamedIdentifier)
     optional<reference_wrapper<T>> findByName(const string& name) {
-        auto identifiers = findById<StandardComponents::NamedIdentifier>();
-        for (const auto& identifier: identifiers) {
-            if (identifier.name == name) {
-                return identifier;
+        auto identifiers = findById<T>();
+        for (auto&& identifier: identifiers) {
+            if (identifier.getId() == typeid(T) && identifier.name == name) {
+                return make_optional(reference_wrapper<T>(identifier));
+                break;
             }
         }
         return optional<reference_wrapper<T>>();