diff --git a/src/AbstractResourceLoader.h b/src/AbstractResourceLoader.h
index 6100eddc9..892f13de3 100644
--- a/src/AbstractResourceLoader.h
+++ b/src/AbstractResourceLoader.h
@@ -162,7 +162,7 @@ template<class T> class AbstractResourceLoader {
 
         /** @overload */
         template<class U> void set(ResourceKey key, U&& data, ResourceDataState state, ResourcePolicy policy) {
-            set(key, new typename std::remove_cv<typename std::remove_reference<U>::type>::type(std::forward<U>(data)), state, policy);
+            set(key, new typename std::decay<U>::type(std::forward<U>(data)), state, policy);
         }
 
         /**
@@ -177,7 +177,7 @@ template<class T> class AbstractResourceLoader {
 
         /** @overload */
         template<class U> void set(ResourceKey key, U&& data) {
-            set(key, new typename std::remove_cv<typename std::remove_reference<U>::type>::type(std::forward<U>(data)));
+            set(key, new typename std::decay<U>::type(std::forward<U>(data)));
         }
 
         /**
diff --git a/src/ResourceManager.h b/src/ResourceManager.h
index 114983d6a..ab8c70659 100644
--- a/src/ResourceManager.h
+++ b/src/ResourceManager.h
@@ -315,7 +315,7 @@ template<class... Types> class ResourceManager: private Implementation::Resource
 
         /** @overload */
         template<class U> ResourceManager<Types...>& set(ResourceKey key, U&& data, ResourceDataState state, ResourcePolicy policy) {
-            return set(key, new typename std::remove_cv<typename std::remove_reference<U>::type>::type(std::forward<U>(data)), state, policy);
+            return set(key, new typename std::decay<U>::type(std::forward<U>(data)), state, policy);
         }
 
         /**
@@ -331,7 +331,7 @@ template<class... Types> class ResourceManager: private Implementation::Resource
 
         /** @overload */
         template<class U> ResourceManager<Types...>& set(ResourceKey key, U&& data) {
-            return set(key, new typename std::remove_cv<typename std::remove_reference<U>::type>::type(std::forward<U>(data)));
+            return set(key, new typename std::decay<U>::type(std::forward<U>(data)));
         }
 
         /** @brief Fallback for not found resources */
@@ -355,7 +355,7 @@ template<class... Types> class ResourceManager: private Implementation::Resource
 
         /** @overload */
         template<class U> ResourceManager<Types...>& setFallback(U&& data) {
-            return setFallback(new typename std::remove_cv<typename std::remove_reference<U>::type>::type(std::forward<U>(data)));
+            return setFallback(new typename std::decay<U>::type(std::forward<U>(data)));
         }
 
         /**