Fix Francois's bug