Fix the Factory