apply patch from KDr2