Bug 961475 and 957164