Attempt to fix nesting problme #2