Closes #702