fixing bug 2438