diff --git a/include/boost/mp11/map.hpp b/include/boost/mp11/map.hpp
index b9581ac..a60119d 100644
--- a/include/boost/mp11/map.hpp
+++ b/include/boost/mp11/map.hpp
@@ -53,14 +53,20 @@ template<class M, class T> using mp_map_replace = typename detail::mp_map_replac
 namespace detail
 {
 
-template<class M, class T, template<class...> class F> struct mp_map_update_impl
+template<class T> struct mp_map_update_impl_f
 {
     template<class U> using _f = std::is_same<mp_first<T>, mp_first<U>>;
+};
 
+template<template<class...> class F> struct mp_map_update_impl_f3
+{
     // _f3<L<X, Y...>> -> L<X, F<X, Y...>>
     template<class L> using _f3 = mp_assign<L, mp_list<mp_first<L>, mp_rename<L, F> > >;
+};
 
-    using type = mp_if< mp_map_contains<M, mp_first<T>>, mp_transform_if<_f, _f3, M>, mp_push_back<M, T> >;
+template<class M, class T, template<class...> class F> struct mp_map_update_impl
+{
+    using type = mp_if< mp_map_contains<M, mp_first<T>>, mp_transform_if<mp_map_update_impl_f<T>::template _f, mp_map_update_impl_f3<F>::template _f3, M>, mp_push_back<M, T> >;
 };
 
 } // namespace detail