highlight fixed
Merge branch '769' into develop , fixes issue #769