removed some bug in highlighting