bug 843762, bug 842215  Fix regression