AuthGateway fix?