Fix #897