* Patch by Detlev Zundel, 30 Jun 2005: