Fix for existing builders in genericbuilder