Fix manufacturer construct