PRD-1632 fix

Fix for https://mirantis.jira.com/browse/PRD-1632