fixed conditions
fixing report generation