Fixing report generation...