Correction of Olivier's bug