Fix bug #960