wrote a patch for bug 859756