Fix regresion due the change of order