Closes #620