fixing bug 1284