fix overzealous nesting