Finally fixed highlighting issue