working on issue #768