Temp patch for erroneous nesting. Still buggy.