diff --git a/src/Magnum/SceneGraph/FeatureGroup.h b/src/Magnum/SceneGraph/FeatureGroup.h
index 1670d06b2..46982149c 100644
--- a/src/Magnum/SceneGraph/FeatureGroup.h
+++ b/src/Magnum/SceneGraph/FeatureGroup.h
@@ -51,7 +51,7 @@ template<UnsignedInt dimensions, class T> class AbstractFeatureGroup {
     void add(AbstractFeature<dimensions, T>& feature);
     void remove(AbstractFeature<dimensions, T>& feature);
 
-    std::vector<AbstractFeature<dimensions, T>*> features;
+    std::vector<std::reference_wrapper<AbstractFeature<dimensions, T>>> features;
 };
 
 /**
@@ -86,12 +86,12 @@ template<UnsignedInt dimensions, class Feature, class T> class FeatureGroup: pub
 
         /** @brief Feature at given index */
         Feature& operator[](std::size_t index) {
-            return *static_cast<Feature*>(AbstractFeatureGroup<dimensions, T>::features[index]);
+            return static_cast<Feature&>(AbstractFeatureGroup<dimensions, T>::features[index].get());
         }
 
         /** @overload */
         const Feature& operator[](std::size_t index) const {
-            return *static_cast<Feature*>(AbstractFeatureGroup<dimensions, T>::features[index]);
+            return static_cast<Feature&>(AbstractFeatureGroup<dimensions, T>::features[index].get());
         }
 
         /**
@@ -160,7 +160,7 @@ template<class Feature> using FeatureGroup3D = BasicFeatureGroup3D<Feature, Floa
 #endif
 
 template<UnsignedInt dimensions, class Feature, class T> FeatureGroup<dimensions, Feature, T>::~FeatureGroup() {
-    for(auto i: AbstractFeatureGroup<dimensions, T>::features) static_cast<Feature*>(i)->_group = nullptr;
+    for(auto i: AbstractFeatureGroup<dimensions, T>::features) static_cast<Feature&>(i.get())._group = nullptr;
 }
 
 template<UnsignedInt dimensions, class Feature, class T> FeatureGroup<dimensions, Feature, T>& FeatureGroup<dimensions, Feature, T>::add(Feature& feature) {
diff --git a/src/Magnum/SceneGraph/FeatureGroup.hpp b/src/Magnum/SceneGraph/FeatureGroup.hpp
index 2b61092c7..9ad9f3dc7 100644
--- a/src/Magnum/SceneGraph/FeatureGroup.hpp
+++ b/src/Magnum/SceneGraph/FeatureGroup.hpp
@@ -39,11 +39,12 @@ template<UnsignedInt dimensions, class T> AbstractFeatureGroup<dimensions, T>::A
 template<UnsignedInt dimensions, class T> AbstractFeatureGroup<dimensions, T>::~AbstractFeatureGroup() = default;
 
 template<UnsignedInt dimensions, class T> void AbstractFeatureGroup<dimensions, T>::add(AbstractFeature<dimensions, T>& feature) {
-    features.push_back(&feature);
+    features.push_back(feature);
 }
 
 template<UnsignedInt dimensions, class T> void AbstractFeatureGroup<dimensions, T>::remove(AbstractFeature<dimensions, T>& feature) {
-    features.erase(std::find(features.begin(), features.end(), &feature));
+    features.erase(std::find_if(features.begin(), features.end(),
+        [&feature](AbstractFeature<dimensions, T>& f) { return &f == &feature; }));
 }
 
 }}