Closes #760