Fix #947