fixes #671