PIM-3371 : re-word to fix static analysis