Fixed highlighting bug