PIM-3250 : fix locale and scope check