PIM-2716 : quick fix