Finally fixing the factories.