Fix first element is not being highlighted