Fix bug 960261