commit #768