Update thanks to Matthieu comments