@vlimant, is this needed change? Previous patch didn't contain this.