Fix factory for builder