patch from RT#86010