PIM-3359 : fix interface