Report Fix
Merge branch 'hotfix/report_fix'