Fix #960