PRD-1130 fix

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