Oops, I forgot to save some of the changes before previous commit :-)