More regresion fixing.