Closes #608