Fix #963