PDIO-450 fix