Fix eval highlight