PIM-2307: Fix issue