No-highlights bugfix