A patch from Stefan Müller.