#21 reports fix