Apparent fix for ec2 integration test... fixes #10