Please review the attached patch.

 

Thanks,
Hannes