diff --git a/core/include/engine/common/Hamiltonian.hpp b/core/include/engine/common/Hamiltonian.hpp
index fe648c826..452efc8ed 100644
--- a/core/include/engine/common/Hamiltonian.hpp
+++ b/core/include/engine/common/Hamiltonian.hpp
@@ -626,7 +626,8 @@ class HamiltonianVariant : public TypeTraits
     template<class T>
     [[nodiscard]] bool hasInteraction()
     {
-        return std::visit( []( auto & h ) { return h.template hasInteraction<T>(); }, hamiltonian );
+        return std::visit(
+            []( auto & h ) { return std::decay_t<decltype( h )>::template hasInteraction<T>(); }, hamiltonian );
     };
 
     template<class T>
@@ -641,7 +642,7 @@ class HamiltonianVariant : public TypeTraits
         return std::visit(
             []( const auto & h ) -> const typename T::Data *
             {
-                if constexpr( h.template hasInteraction<T>() )
+                if constexpr( std::decay_t<decltype( h )>::template hasInteraction<T>() )
                     return &h.template data<T>();
                 else
                     return nullptr;
@@ -655,7 +656,7 @@ class HamiltonianVariant : public TypeTraits
         return std::visit(
             []( const auto & h ) -> const typename T::Cache *
             {
-                if constexpr( h.template hasInteraction<T>() )
+                if constexpr( std::decay_t<decltype( h )>::template hasInteraction<T>() )
                     return &h.template cache<T>();
                 else
                     return nullptr;
@@ -670,7 +671,7 @@ class HamiltonianVariant : public TypeTraits
             [this,
              data = typename T::Data( std::forward<Args>( args )... )]( auto & h ) mutable -> std::optional<std::string>
             {
-                if constexpr( h.template hasInteraction<T>() )
+                if constexpr( std::decay_t<decltype( h )>::template hasInteraction<T>() )
                     return h.template set_data<T>( std::move( data ) );
                 else
                     return fmt::format(