Fix until 1.3  (take into account Anne Cecile remarks) - Adrien