Fixing check of USE_AWS