Applied changes from AUSTESE Ticket 265 refarding line numbers