Final commit ?
Aaaaand a little fix