Solve an issue in TCBTBuildVariantMAtrix