patch from Torsten Hahmann