Compatibility fix for ec2/cluster