fix report
Merge branch 'hotfix/fix_report'