Fixing bug 1263