Fixing bug 982 two