Closes #768