Fix #958