fixing bug 349829