Fix #944