PIM-1511 : Fix refactoring