Fix bug 960675