fixing bug 1275