Fixed wrong highlight