prd-1914 fix