patch to fix bug 8072, but need some help with tests