Fix for bug 1022948