1. A fix for clients created from an access token.