PIM-1771 : re-order methods