Fix #964