PRD-1632 fix