Fix #966