Try to take into account Flavien comments - Adrien