Fixing routing for AWS