Fixed Guillaume's errors :-P