patch for bnc #786650