bugfix on highlights