fixed report handling