Okay, new patch attached.

Happy holidays!

Andreas