#1: temporarily fix ec2 hostname problems by including the ec2 state