Patch from Harti Brandt <brandt@fokus.fraunhofer.de>