Fix for AWS deployments