CLOUDIFY-2603 bug fix