CFY-1230 fixed ec2 handlers