No more highlighting fix