I think for the sevent time I have fixed commenting
merged
debugged merge from Frederic-Marchard#1