Fix for bug 1022444