Fixing bug 982 one