attempt to fix nesting again