commit #671