Fix #996