COSMIT: address @agramfort's comments