FIxing highlight