Applied changes from AUSTESE Ticket 176