PIM-2035 : fix variant scenario