Fixed issue PDCL-48