Please review the attached patch.

Many thanks,
Valentin