Fix for bug 995034