diff --git a/src/board/UBFeaturesController.h b/src/board/UBFeaturesController.h
index 5b56d8c4..92008227 100644
--- a/src/board/UBFeaturesController.h
+++ b/src/board/UBFeaturesController.h
@@ -59,7 +59,7 @@ public:
 	UBFeaturesController(QWidget *parentWidget);
     virtual ~UBFeaturesController();
 
-    const QList <UBFeature>& getFeatures()const { return featuresList; }
+    QList <UBFeature>* getFeatures()const { return featuresList; }
 	
     const QString& getRootPath()const { return rootPath; }
 
@@ -89,7 +89,7 @@ private:
 
 	static UBFeatureElementType fileTypeFromUrl( const QString &path );
 
-	QList <UBFeature> featuresList;
+	QList <UBFeature> *featuresList;
 	UBFeature *rootElement;
 
 	QString mUserAudioDirectoryPath;
@@ -132,7 +132,7 @@ private:
 	UBFeature shapesElement;
 	UBFeature searchElement;
 
-	QSet <QString> favoriteSet;
+	QSet <QString> *favoriteSet;
 };
 
 
diff --git a/src/gui/UBFeaturesWidget.h b/src/gui/UBFeaturesWidget.h
index 614c0335..faaea0c4 100644
--- a/src/gui/UBFeaturesWidget.h
+++ b/src/gui/UBFeaturesWidget.h
@@ -205,9 +205,9 @@ public:
 	
     Qt::DropActions supportedDropActions() const { return Qt::MoveAction | Qt::CopyAction; }
 
-    void setFeaturesList(const QList <UBFeature> &flist ) { featuresList = flist; }
+    void setFeaturesList(QList <UBFeature> *flist ) { featuresList = flist; }
 private:
-	QList <UBFeature> featuresList;
+	QList <UBFeature> *featuresList;
 };
 
 class UBFeaturesProxyModel : public QSortFilterProxyModel