Added a hack to enable support for AWS ELBs