with a better commit msg this time -- Vincent Legoll