CFY-799 consider provider context in count