Fixing bug 1260