Fix #671