diff --git a/include/hpp/manipulation/graph/graph-component.hh b/include/hpp/manipulation/graph/graph-component.hh
index f5ea14d36e7cd32111a42bd0171d00b43031b61c..b4da2987a13f8ab654b66a460024cfa79061af18 100644
--- a/include/hpp/manipulation/graph/graph-component.hh
+++ b/include/hpp/manipulation/graph/graph-component.hh
@@ -21,6 +21,7 @@
 # include <ostream>
 
 # include "hpp/manipulation/config.hh"
+# include "hpp/manipulation/deprecated.hh"
 # include "hpp/manipulation/fwd.hh"
 # include "hpp/manipulation/graph/fwd.hh"
 # include "hpp/manipulation/graph/dot.hh"
diff --git a/include/hpp/manipulation/graph/graph.hh b/include/hpp/manipulation/graph/graph.hh
index c3c597ff0c8689796bd4915fcc9134cf00f88bb6..ff07201995951b2b16f7018bb2487f7af084d023 100644
--- a/include/hpp/manipulation/graph/graph.hh
+++ b/include/hpp/manipulation/graph/graph.hh
@@ -238,9 +238,7 @@ namespace hpp {
 
           /// Constructor
 	  /// \param sm a steering method to create paths from edges
-          Graph (const std::string& name, const ProblemPtr_t& problem) :
-	    GraphComponent (name), problem_ (problem)
-          {}
+          Graph (const std::string& name, const ProblemPtr_t& problem);
 
           /// Print the object in a stream.
           std::ostream& print (std::ostream& os) const;
diff --git a/src/graph/graph.cc b/src/graph/graph.cc
index 84d6f9a3052c4fde49574b310911cac5ddad1ae3..3d5ba3b7ccc858ce0d3afc3339d42b0116cb3360 100644
--- a/src/graph/graph.cc
+++ b/src/graph/graph.cc
@@ -35,6 +35,7 @@ namespace hpp {
         Graph* ptr = new Graph (name, problem);
         GraphPtr_t shPtr (ptr);
         ptr->init (shPtr, robot);
+        shPtr->createStateSelector (name);
         return shPtr;
       }
 
@@ -242,6 +243,11 @@ namespace hpp {
         return components_;
       }
 
+      Graph::Graph (const std::string& name, const ProblemPtr_t& problem) :
+        GraphComponent (name), problem_ (problem)
+      {
+      }
+
       std::ostream& Graph::dotPrint (std::ostream& os, dot::DrawingAttributes da) const
       {
         da.separator = "; ";