Olivier's bug correction.