CLOUDIFY-1944 bug fix