PRD-1130 fix