Working through AWS bug