Fixed PR for AuthenticationHandler