Oai 285

fixes #285, maybe