Fix factory...again.