fixing bug 1282