Apply fabienne's advices