diff --git a/src/entt/entity/group.hpp b/src/entt/entity/group.hpp
index 06824a43a..4d8b958dc 100644
--- a/src/entt/entity/group.hpp
+++ b/src/entt/entity/group.hpp
@@ -165,10 +165,10 @@ class basic_group<Entity, exclude_t<Exclude...>, get_t<Get...>> final {
     template<typename Func, typename... Weak>
     void traverse(Func func, type_list<Weak...>) const {
         for(const auto entt: *handler) {
-            if constexpr(std::is_invocable_v<Func, decltype(get<Weak>({}))...>) {
-                func(std::get<pool_type<Weak> *>(pools)->get(entt)...);
-            } else {
+            if constexpr(std::is_invocable_v<Func, entity_type, decltype(get<Weak>({}))...>) {
                 func(entt, std::get<pool_type<Weak> *>(pools)->get(entt)...);
+            } else {
+                func(std::get<pool_type<Weak> *>(pools)->get(entt)...);
             }
         }
     }
@@ -743,16 +743,14 @@ class basic_group<Entity, exclude_t<Exclude...>, get_t<Get...>, Owned...> final
         [[maybe_unused]] auto data = std::get<0>(pools)->basic_sparse_set<entity_type>::end() - *length;
 
         for(auto next = *length; next; --next) {
-            if constexpr(std::is_invocable_v<Func, decltype(get<Strong>({}))..., decltype(get<Weak>({}))...>) {
-                if constexpr(sizeof...(Weak) == 0) {
-                    func(*(std::get<component_iterator<Strong>>(it)++)...);
-                } else {
-                    const auto entt = *(data++);
-                    func(*(std::get<component_iterator<Strong>>(it)++)..., std::get<pool_type<Weak> *>(pools)->get(entt)...);
-                }
-            } else {
+            if constexpr(std::is_invocable_v<Func, entity_type, decltype(get<Strong>({}))..., decltype(get<Weak>({}))...>) {
                 const auto entt = *(data++);
                 func(entt, *(std::get<component_iterator<Strong>>(it)++)..., std::get<pool_type<Weak> *>(pools)->get(entt)...);
+            } else if constexpr(sizeof...(Weak) == 0) {
+                func(*(std::get<component_iterator<Strong>>(it)++)...);
+            } else {
+                const auto entt = *(data++);
+                func(*(std::get<component_iterator<Strong>>(it)++)..., std::get<pool_type<Weak> *>(pools)->get(entt)...);
             }
         }
     }
diff --git a/src/entt/entity/view.hpp b/src/entt/entity/view.hpp
index c1ff3977e..4c65ef7ce 100644
--- a/src/entt/entity/view.hpp
+++ b/src/entt/entity/view.hpp
@@ -275,10 +275,10 @@ class basic_view<Entity, exclude_t<Exclude...>, Component...> final {
                 if(((std::is_same_v<Comp, Component> || std::get<pool_type<Component> *>(pools)->contains(entt)) && ...)
                         && (sizeof...(Exclude) == 0 || std::none_of(filter.cbegin(), filter.cend(), [entt](const basic_sparse_set<Entity> *cpool) { return cpool->contains(entt); })))
                 {
-                    if constexpr(std::is_invocable_v<Func, decltype(get<Type>({}))...>) {
-                        func(get<Comp, Type>(it, std::get<pool_type<Type> *>(pools), entt)...);
-                    } else {
+                    if constexpr(std::is_invocable_v<Func, entity_type, decltype(get<Type>({}))...>) {
                         func(entt, get<Comp, Type>(it, std::get<pool_type<Type> *>(pools), entt)...);
+                    } else {
+                        func(get<Comp, Type>(it, std::get<pool_type<Type> *>(pools), entt)...);
                     }
                 }
 
@@ -289,10 +289,10 @@ class basic_view<Entity, exclude_t<Exclude...>, Component...> final {
                 if(((std::is_same_v<Comp, Component> || std::get<pool_type<Component> *>(pools)->contains(entt)) && ...)
                         && (sizeof...(Exclude) == 0 || std::none_of(filter.cbegin(), filter.cend(), [entt](const basic_sparse_set<Entity> *cpool) { return cpool->contains(entt); })))
                 {
-                    if constexpr(std::is_invocable_v<Func, decltype(get<Type>({}))...>) {
-                        func(std::get<pool_type<Type> *>(pools)->get(entt)...);
-                    } else {
+                    if constexpr(std::is_invocable_v<Func, entity_type, decltype(get<Type>({}))...>) {
                         func(entt, std::get<pool_type<Type> *>(pools)->get(entt)...);
+                    } else {
+                        func(std::get<pool_type<Type> *>(pools)->get(entt)...);
                     }
                 }
             }
@@ -952,26 +952,26 @@ public:
     template<typename Func>
     void each(Func func) const {
         if constexpr(is_eto_eligible_v<Component>) {
-            if constexpr(std::is_invocable_v<Func>) {
-                for(auto pos = pool->size(); pos; --pos) {
-                    func();
-                }
-            } else {
+            if constexpr(std::is_invocable_v<Func, entity_type>) {
                 for(const auto entt: *this) {
                     func(entt);
                 }
+            } else {
+                for(auto pos = pool->size(); pos; --pos) {
+                    func();
+                }
             }
         } else {
-            if constexpr(std::is_invocable_v<Func, std::add_lvalue_reference_t<Component>>) {
-                for(auto &&component: *pool) {
-                    func(component);
-                }
-            } else {
+            if constexpr(std::is_invocable_v<Func, entity_type, std::add_lvalue_reference_t<Component>>) {
                 auto raw = pool->begin();
 
                 for(const auto entt: *this) {
                     func(entt, *(raw++));
                 }
+            } else {
+                for(auto &&component: *pool) {
+                    func(component);
+                }
             }
         }
     }