Fix in GenericBuilder