Fix #962