PRD-1949 fix

Change-Id: I2e824f33699d54a19aa267e94b531a71a7d280da