Fix for bug 1035120