Hi Tobias,

thanks for the review. Please see the attached updated patch.

Have you had time to test it?

Petr