Fix Reporting service