Closes #625