Fixes #673