I started re-writing the commit with a loop. I'll push that result over the week-end, hope you'll find it better :)