Fix issue in AWS API