more work on bug 823097. new patch for bug 920116