fixing bug 1293