apply patch from Bettina Steger