Fix for bug 982855