Fix the factory