Fix for reuse TaskReportHandler code.