fix calixte's bug