Fix 401 Unauthorized issue