Fix #955