Trying to solve the "Unauthorized" issue, #2