PIM-2116 : fix references