I didn't have time to look at that before you merged ^^