CLOUDIFY-1482, fixed duplication that caused compilation errors