Add patch from Harald Koenig <koenig@science-computing.de>