New fix for factory