diff --git a/edo/src/edoSamplerNormalMono.h b/edo/src/edoSamplerNormalMono.h
index 5233e9c89..b3162f92f 100644
--- a/edo/src/edoSamplerNormalMono.h
+++ b/edo/src/edoSamplerNormalMono.h
@@ -39,13 +39,13 @@ Authors:
  * This class uses the NormalMono distribution parameters (bounds) to return
  * a random position used for population sampling.
  */
-template < typename EOT >
-class edoSamplerNormalMono : public edoSampler< edoNormalMono< EOT > >
+template < typename EOT, typename D = edoNormalMono< EOT > >
+class edoSamplerNormalMono : public edoSampler< D >
 {
 public:
     typedef typename EOT::AtomType AtomType;
 
-    edoSamplerNormalMono( edoRepairer<EOT> & repairer ) : edoSampler( repairer) {}
+    edoSamplerNormalMono( edoRepairer<EOT> & repairer ) : edoSampler< D >( repairer) {}
 
     EOT sample( edoNormalMono< EOT >& distrib )
     {
diff --git a/edo/src/edoSamplerNormalMulti.h b/edo/src/edoSamplerNormalMulti.h
index a73a266de..7c08d22b5 100644
--- a/edo/src/edoSamplerNormalMulti.h
+++ b/edo/src/edoSamplerNormalMulti.h
@@ -34,13 +34,13 @@ Authors:
 
 //! edoSamplerNormalMulti< EOT >
 
-template< class EOT >
-class edoSamplerNormalMulti : public edoSampler< edoNormalMulti< EOT > >
+template< class EOT, typename D = edoNormalMulti< EOT > >
+class edoSamplerNormalMulti : public edoSampler< D >
 {
 public:
     typedef typename EOT::AtomType AtomType;
 
-    edoSamplerNormalMulti( edoRepairer<EOT> & repairer ) : edoSampler( repairer) {}
+    edoSamplerNormalMulti( edoRepairer<EOT> & repairer ) : edoSampler< D >( repairer) {}
 
     class Cholesky
     {
diff --git a/edo/src/edoSamplerUniform.h b/edo/src/edoSamplerUniform.h
index 8506ee545..44a59ea87 100644
--- a/edo/src/edoSamplerUniform.h
+++ b/edo/src/edoSamplerUniform.h
@@ -38,13 +38,13 @@ Authors:
  * This class uses the Uniform distribution parameters (bounds) to return
  * a random position used for population sampling.
  */
-template < typename EOT, class D=edoUniform<EOT> > // FIXME: D template name is there really used ?!?
-class edoSamplerUniform : public edoSampler< edoUniform< EOT > >
+template < typename EOT, class D = edoUniform<EOT> >
+class edoSamplerUniform : public edoSampler< D >
 {
 public:
     typedef D Distrib;
 
-    edoSamplerUniform( edoRepairer<EOT> & repairer ) : edoSampler( repairer) {}
+    edoSamplerUniform( edoRepairer<EOT> & repairer ) : edoSampler< D >( repairer) {}
 
     EOT sample( edoUniform< EOT >& distrib )
     {