Fix hybrid line numbering