Fix for bug 1058526