Fixed factory in base model