CLOUDIFY-1490 fixed