Fix bug in Line number handling