patch from RT 97607