fix for jira #DS-62