Factory fix; saving models from the factory resulted in duplication