OSI report: fixes #22