fix for PRD-1294