Applied patch from Günther