fix for highlighting bug