Fix issue with connection accounting