Fixed highlighting