Fix again the factories