Little fix of the lasts modifications... :'(