Added change by ejtagle from 15.02.2012