Fixes #671