Fixed report generation