CLDIDE-2084: fix factory builder