PIM-1516 : fix create export scenario