Fixed IDCPMP-41
Fixed IDCPMP-36