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

But I expected it to fail, so it seems that i could not reproduce original bug