Corrected even more line number counting (starts from zero)