Corrected Adrien's bug