CLOUDIFY-2600 bug fix