Correction for bug 8128 in trunk