Fix IDCPMP-34