Fix reports in any class, not until 3.5