Fix line numbers completely;