PIM-3551 : fix scenario