Fixed unnecessary requests to aws path