Argh, I forgot to attach the patch. Here it is!

Daniel