+1 This should not be the report generator reponsiblity
I'll add this today