I thought I had sent this updated patch to the list, but I can't seem to 
find it in my archives. So here it is again.

Thanks,
Christoph