changes required to remove annoying StructureException calls #54