Fixing bug 1032