Correct the bug raised by Erwan