Fix to work with AWS