PIM-1526 : Fix error introduced during refactoring