Massive work around the _fix() methods, closer to get a coherent system of delayed execution in place.