Fixes #672