Fix prd2190

- Fixes PRD-2190