Fixed issue https://mirantis.jira.com/browse/PRD-1959

Change-Id: I59d58e8e808ab97ae912c4ebadf1ca933b89602b