Fixed report generation

Should be the last update.