diff --git a/.version b/.version
deleted file mode 100644
index 3ad0595adcc26a4d1811520b2bc474ca92c11bb2..0000000000000000000000000000000000000000
--- a/.version
+++ /dev/null
@@ -1 +0,0 @@
-3.1.5
diff --git a/include/sot-dynamic-pinocchio/dynamic-pinocchio.h b/include/sot-dynamic-pinocchio/dynamic-pinocchio.h
index e7800865acafb23cead4467e7c550572c936d6d3..c8e28c66df7e426dfccc5443683085eb25ded6c4 100644
--- a/include/sot-dynamic-pinocchio/dynamic-pinocchio.h
+++ b/include/sot-dynamic-pinocchio/dynamic-pinocchio.h
@@ -45,6 +45,7 @@
 #include <sot/core/matrix-geometry.hh>
 
 /* PINOCCHIO */
+#include <pinocchio/macros.hpp>
 #include <pinocchio/multibody/model.hpp>
 #include <pinocchio/multibody/joint/joint-variant.hpp>
 #include <pinocchio/algorithm/rnea.hpp>
diff --git a/src/sot-dynamic-pinocchio.cpp b/src/sot-dynamic-pinocchio.cpp
index 77d436888f3937a632ccf806e63e72137350783d..db7e33c32ad8586fcb86cd754fc914e6e3f1760d 100644
--- a/src/sot-dynamic-pinocchio.cpp
+++ b/src/sot-dynamic-pinocchio.cpp
@@ -745,9 +745,9 @@ computeGenericJacobian(const bool isFrame, const int jointId, dg::Matrix& res,co
   //Computes Jacobian in world coordinates.
   if(isFrame){
     //se3::framesForwardKinematics(*m_model,*m_data);
-    se3::getFrameJacobian<false>(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
+    se3::getJacobian<se3::LOCAL>(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
   }
-  else se3::getJacobian<false>(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
+  else se3::getJacobian<se3::WORLD>(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
   res = tmp;
   sotDEBUGOUT(25);
   return res;
@@ -768,14 +768,15 @@ computeGenericEndeffJacobian(const bool isFrame, const int jointId,dg::Matrix& r
   //std::string temp;
   if(isFrame){
     //se3::framesForwardKinematics(*m_model,*m_data);
-    se3::getFrameJacobian<true>(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
+    se3::getJacobian<se3::LOCAL>(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
     sotDEBUG(25) << "EndEffJacobian for "
                  << m_model->frames.at((se3::Model::Index)jointId).name
                  <<" is "<<tmp<<std::endl;
   }
   else {
     //temp = m_model->getJointName((se3::Model::Index)jointId);
-    se3::getJacobian<true>(*m_model,*m_data,(se3::Model::Index)jointId,tmp);
+    se3::getJacobian<se3::WORLD>
+      (*m_model,*m_data,(se3::Model::Index)jointId,tmp);
     sotDEBUG(25) << "EndEffJacobian for "
                  << m_model->getJointName((se3::Model::Index)jointId)
                  <<" is "<<tmp<<std::endl;