Highlighting bugfix

@fjakobs @lennartcl