Fix bug 969605