diff --git a/OpenFlipper/common/BaseObject.cc b/OpenFlipper/common/BaseObject.cc
index f4ebfbaf9bf3fdf221d11019b1bff633b85be574..7ade8b69457cfff1b03867d18a2c3fb88c91352e 100644
--- a/OpenFlipper/common/BaseObject.cc
+++ b/OpenFlipper/common/BaseObject.cc
@@ -790,17 +790,11 @@ deleteData() {
 
 }
 
-QMap<QString, PerObjectData*>* BaseObject::getPerObjectDataMap() {
-  return &dataMap_;
+QMap<QString, PerObjectData*>& BaseObject::getPerObjectDataMap() {
+  return dataMap_;
 }
 
 
-void BaseObject::getPerObjectDataMap( QMap<QString, PerObjectData*>* _map ) {
- dataMap_ = *_map; 
-}
-
-
-
 ObjectManager::ObjectManager() {
 }
 
diff --git a/OpenFlipper/common/BaseObject.hh b/OpenFlipper/common/BaseObject.hh
index 9717b796effecbee55a8f84939b98d7343fbe6e4..66d766bca30097e4bd216aa55c461d911d9ca3df 100644
--- a/OpenFlipper/common/BaseObject.hh
+++ b/OpenFlipper/common/BaseObject.hh
@@ -474,21 +474,14 @@ class DLLEXPORTONLY BaseObject : public QObject {
     * @{ */
     //===========================================================================
     
-    /** \brief get map of all perObject Datas
+    /** \brief get reference to map of all perObject Datas
     *
     * Don't use this function! It's only for the backup Plugin to store and restore
     * perObjectDatas!
     */
-    QMap<QString, PerObjectData*>* getPerObjectDataMap();
+    QMap<QString, PerObjectData*>& getPerObjectDataMap();
     
     
-    /** \brief set map of all perObject Datas
-    *
-    * Don't use this function! It's only for the backup Plugin to store and restore
-    * perObjectDatas!
-    */
-    void getPerObjectDataMap( QMap<QString, PerObjectData*>* _map );
-
   private:
 
     QMap<QString, PerObjectData* > dataMap_;