Fixing reporting issue for data driven