fixing bug 4421