fixing bug 8218