Your solution was correct. Thanks for the contribution.

I've checked this into the repository in revision 2952.

Regards,
Andreas